Merge existing fixes from regulator/for-5.14

[linux-2.6-microblaze.git] / drivers / comedi / drivers / comedi_8254.c

diff --git a/drivers/comedi/drivers/comedi_8254.c b/drivers/comedi/drivers/comedi_8254.c
index d1d509e..4bf5daa 100644 (file)
--- a/drivers/comedi/drivers/comedi_8254.c
+++ b/drivers/comedi/drivers/comedi_8254.c
@@ -555,6 +555,7 @@ static int comedi_8254_insn_config(struct comedi_device *dev,
 /**
  * comedi_8254_subdevice_init - initialize a comedi_subdevice for the 8254 timer
  * @s:         comedi_subdevice struct
+ * @i8254:     comedi_8254 struct
  */
 void comedi_8254_subdevice_init(struct comedi_subdevice *s,
                                struct comedi_8254 *i8254)
@@ -607,7 +608,7 @@ static struct comedi_8254 *__i8254_init(unsigned long iobase,
 
 /**
  * comedi_8254_init - allocate and initialize the 8254 device for pio access
- * @mmio:      port I/O base address
+ * @iobase:    port I/O base address
  * @osc_base:  base time of the counter in ns
  *             OPTIONAL - only used by comedi_8254_cascade_ns_to_timer()
  * @iosize:    I/O register size