From: H Hartley Sweeten Date: Mon, 10 Mar 2014 21:07:26 +0000 (-0700) Subject: staging: comedi: c6xdigio: tidy up C6X_pwmInit() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0aeb924b342820b64a6c8a2bb424495ecc4603a1;p=linux-beck.git staging: comedi: c6xdigio: tidy up C6X_pwmInit() 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 --- diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c index 22315b81a973..fc317b06dd9d 100644 --- a/drivers/staging/comedi/drivers/c6xdigio.c +++ b/drivers/staging/comedi/drivers/c6xdigio.c @@ -92,19 +92,19 @@ static int c6xdigio_chk_status(unsigned long baseAddr, unsigned long context) return -EBUSY; } -static void C6X_pwmInit(unsigned long baseAddr) +static void c6xdigio_pwm_init(struct comedi_device *dev) { - outb_p(0x70, baseAddr); - c6xdigio_chk_status(baseAddr, 0x00); + outb_p(0x70, dev->iobase); + c6xdigio_chk_status(dev->iobase, 0x00); - outb_p(0x74, baseAddr); - c6xdigio_chk_status(baseAddr, 0x80); + outb_p(0x74, dev->iobase); + c6xdigio_chk_status(dev->iobase, 0x80); - outb_p(0x70, baseAddr); - c6xdigio_chk_status(baseAddr, 0x00); + outb_p(0x70, 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 void C6X_pwmOutput(unsigned long baseAddr, unsigned channel, int value) @@ -240,7 +240,7 @@ static int c6xdigio_ei_insn_read(struct comedi_device *dev, static void board_init(struct comedi_device *dev) { - C6X_pwmInit(dev->iobase); + c6xdigio_pwm_init(dev); C6X_encResetAll(dev->iobase); }