summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/c6xdigio.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-03-10 14:07:27 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-17 14:03:58 -0700
commitb133c2bfadf392683db58cc7e153d9b1866a7c62 (patch)
tree672cc2892191cee28243820c2265b0a254d856fa /drivers/staging/comedi/drivers/c6xdigio.c
parent0aeb924b342820b64a6c8a2bb424495ecc4603a1 (diff)
staging: comedi: c6xdigio: tidy up C6X_encResetAll()
Rename the CamelCase function. For aesthetics, pass the comedi_device pointer instead of the dev->iobase. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/c6xdigio.c')
-rw-r--r--drivers/staging/comedi/drivers/c6xdigio.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index fc317b06dd9d..9e456e5c73e4 100644
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -195,19 +195,19 @@ static int C6X_encInput(unsigned long baseAddr, unsigned channel)
return enc.value ^ 0x800000;
}
-static void C6X_encResetAll(unsigned long baseAddr)
+static void c6xdigio_encoder_reset(struct comedi_device *dev)
{
- outb_p(0x68, baseAddr);
- c6xdigio_chk_status(baseAddr, 0x00);
+ outb_p(0x68, dev->iobase);
+ c6xdigio_chk_status(dev->iobase, 0x00);
- outb_p(0x6c, baseAddr);
- c6xdigio_chk_status(baseAddr, 0x80);
+ outb_p(0x6c, dev->iobase);
+ c6xdigio_chk_status(dev->iobase, 0x80);
- outb_p(0x68, baseAddr);
- c6xdigio_chk_status(baseAddr, 0x00);
+ outb_p(0x68, dev->iobase);
+ c6xdigio_chk_status(dev->iobase, 0x00);
- outb_p(0x0, baseAddr);
- c6xdigio_chk_status(baseAddr, 0x80);
+ outb_p(0x0, dev->iobase);
+ c6xdigio_chk_status(dev->iobase, 0x80);
}
static int c6xdigio_pwmo_insn_write(struct comedi_device *dev,
@@ -241,7 +241,7 @@ static int c6xdigio_ei_insn_read(struct comedi_device *dev,
static void board_init(struct comedi_device *dev)
{
c6xdigio_pwm_init(dev);
- C6X_encResetAll(dev->iobase);
+ c6xdigio_encoder_reset(dev);
}
static const struct pnp_device_id c6xdigio_pnp_tbl[] = {