diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-05 09:12:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:36:11 -0700 |
| commit | 318a5b2a505fe7a99f0d89889e7a84d57ec49b15 (patch) | |
| tree | 3d6ec6df51497abe45b39893ef2f4341e42df0f8 | |
| parent | c5efe58b83bc5c1d5811800faf03b1089d1ef054 (diff) | |
| download | kernel_samsung_smdk4412-318a5b2a505fe7a99f0d89889e7a84d57ec49b15.zip kernel_samsung_smdk4412-318a5b2a505fe7a99f0d89889e7a84d57ec49b15.tar.gz kernel_samsung_smdk4412-318a5b2a505fe7a99f0d89889e7a84d57ec49b15.tar.bz2 | |
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 <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidas64.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 3443fc1..79aa286 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; |