Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317368
b: refs/heads/master
c: f9af899
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 14, 2012
1 parent c6d545e commit e1f7e50
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 459f299e5b1759644a6cde8328919b6e542fb9eb
refs/heads/master: f9af899b0c6c778083d1040349930a0f9fffb525
20 changes: 10 additions & 10 deletions trunk/drivers/staging/comedi/drivers/8255.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ struct subdev_8255_private {
int (*io) (int, int, int, unsigned long);
};

static int subdev_8255_io(int dir, int port, int data, unsigned long iobase)
{
if (dir) {
outb(data, iobase + port);
return 0;
} else {
return inb(iobase + port);
}
}

void subdev_8255_interrupt(struct comedi_device *dev,
struct comedi_subdevice *s)
{
Expand All @@ -119,16 +129,6 @@ void subdev_8255_interrupt(struct comedi_device *dev,
}
EXPORT_SYMBOL(subdev_8255_interrupt);

static int subdev_8255_io(int dir, int port, int data, unsigned long iobase)
{
if (dir) {
outb(data, iobase + port);
return 0;
} else {
return inb(iobase + port);
}
}

static int subdev_8255_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
Expand Down

0 comments on commit e1f7e50

Please sign in to comment.