From b133c2bfadf392683db58cc7e153d9b1866a7c62 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 10 Mar 2014 14:07:27 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/c6xdigio.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c index fc317b06..9e456e5 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[] = { -- 2.7.4