Skip to content

Commit

Permalink
Staging: comedi: cb_pcidas64: fix up build warnings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed May 11, 2010
1 parent c5efe58 commit 318a5b2
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/staging/comedi/drivers/cb_pcidas64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand Down

0 comments on commit 318a5b2

Please sign in to comment.