Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197237
b: refs/heads/master
c: 135998c
h: refs/heads/master
i:
  197235: 76b0237
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 11, 2010
1 parent afa0af4 commit 44dcd78
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 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: 30162d690c3539594b6dcebd677c985c6a74249e
refs/heads/master: 135998cc006c764dcfa147df84185614012852e5
21 changes: 12 additions & 9 deletions trunk/drivers/staging/comedi/drivers/8255.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ COMEDI_INITCLEANUP(driver_8255);

static void do_config(struct comedi_device *dev, struct comedi_subdevice *s);

void subdev_8255_interrupt(struct comedi_device *dev,
struct comedi_subdevice *s)
static void subdev_8255_interrupt(struct comedi_device *dev,
struct comedi_subdevice *s)
{
short d;

Expand Down Expand Up @@ -319,9 +319,10 @@ static int subdev_8255_cancel(struct comedi_device *dev,
return 0;
}

int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s,
int (*cb) (int, int, int, unsigned long),
unsigned long arg)
static int subdev_8255_init(struct comedi_device *dev,
struct comedi_subdevice *s,
int (*cb) (int, int, int, unsigned long),
unsigned long arg)
{
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
Expand Down Expand Up @@ -349,9 +350,10 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s,
}
EXPORT_SYMBOL(subdev_8255_init);

int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
int (*cb) (int, int, int, unsigned long),
unsigned long arg)
static int subdev_8255_init_irq(struct comedi_device *dev,
struct comedi_subdevice *s,
int (*cb) (int, int, int, unsigned long),
unsigned long arg)
{
int ret;

Expand All @@ -369,7 +371,8 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
}
EXPORT_SYMBOL(subdev_8255_init_irq);

void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice *s)
static void subdev_8255_cleanup(struct comedi_device *dev,
struct comedi_subdevice *s)
{
if (s->private) {
/* this test does nothing, so comment it out
Expand Down

0 comments on commit 44dcd78

Please sign in to comment.