From: Greg Kroah-Hartman Date: Wed, 5 May 2010 16:12:13 +0000 (-0700) Subject: Staging: comedi: cb_pcidas64: fix up build warnings X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=318a5b2a505fe7a99f0d89889e7a84d57ec49b15;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Staging: comedi: cb_pcidas64: fix up build warnings Now that the 8255.h file is being included properly, we were using the incorrect function prototypes, which causes a build warning now. This fixes it up and preserves the __iomem markings that sparse wants to see. Cc: Ian Abbott Cc: Frank Mori Hess Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 3443fc1b9186..79aa286e9bb4 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -1183,8 +1183,8 @@ static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, static irqreturn_t handle_interrupt(int irq, void *d); static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s); -static int dio_callback(int dir, int port, int data, void __iomem *base); -static int dio_callback_4020(int dir, int port, int data, void __iomem *base); +static int dio_callback(int dir, int port, int data, unsigned long arg); +static int dio_callback_4020(int dir, int port, int data, unsigned long arg); static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, @@ -3658,8 +3658,9 @@ static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s) return 0; } -static int dio_callback(int dir, int port, int data, void __iomem *iobase) +static int dio_callback(int dir, int port, int data, unsigned long arg) { + void __iomem *iobase = (void __iomem *)arg; if (dir) { writeb(data, iobase + port); DEBUG_PRINT("wrote 0x%x to port %i\n", data, port); @@ -3669,8 +3670,9 @@ static int dio_callback(int dir, int port, int data, void __iomem *iobase) } } -static int dio_callback_4020(int dir, int port, int data, void __iomem *iobase) +static int dio_callback_4020(int dir, int port, int data, unsigned long arg) { + void __iomem *iobase = (void __iomem *)arg; if (dir) { writew(data, iobase + 2 * port); return 0;