Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175059
b: refs/heads/master
c: 228ec34
h: refs/heads/master
i:
  175057: 33aa168
  175055: 4b8ccd1
v: v3
  • Loading branch information
Ben Kero authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 7fde28a commit 0ed117d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 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: 155b44aae0ed9a0f9aecc8c528ba5bc3b26f8377
refs/heads/master: 228ec3402130b158ccd0e690ac5c4a0b27317786
23 changes: 10 additions & 13 deletions trunk/drivers/staging/comedi/drivers/8255.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ void subdev_8255_interrupt(struct comedi_device *dev,

comedi_event(dev, s);
}
EXPORT_SYMBOL(subdev_8255_interrupt);

static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
{
Expand Down Expand Up @@ -179,15 +180,14 @@ static int subdev_8255_insn_config(struct comedi_device *dev,
unsigned int bits;

mask = 1 << CR_CHAN(insn->chanspec);
if (mask & 0x0000ff) {
if (mask & 0x0000ff)
bits = 0x0000ff;
} else if (mask & 0x00ff00) {
else if (mask & 0x00ff00)
bits = 0x00ff00;
} else if (mask & 0x0f0000) {
else if (mask & 0x0f0000)
bits = 0x0f0000;
} else {
else
bits = 0xf00000;
}

switch (data[0]) {
case INSN_CONFIG_DIO_INPUT:
Expand Down Expand Up @@ -333,11 +333,10 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s,
return -ENOMEM;

CALLBACK_ARG = arg;
if (cb == NULL) {
if (cb == NULL)
CALLBACK_FUNC = subdev_8255_cb;
} else {
else
CALLBACK_FUNC = cb;
}
s->insn_bits = subdev_8255_insn;
s->insn_config = subdev_8255_insn_config;

Expand All @@ -347,6 +346,7 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s,

return 0;
}
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),
Expand All @@ -366,6 +366,7 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,

return 0;
}
EXPORT_SYMBOL(subdev_8255_init_irq);

void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice *s)
{
Expand All @@ -378,6 +379,7 @@ void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice *s)
kfree(s->private);
}
}
EXPORT_SYMBOL(subdev_8255_cleanup);

/*
Expand Down Expand Up @@ -448,8 +450,3 @@ static int dev_8255_detach(struct comedi_device *dev)

return 0;
}

EXPORT_SYMBOL(subdev_8255_init);
EXPORT_SYMBOL(subdev_8255_init_irq);
EXPORT_SYMBOL(subdev_8255_cleanup);
EXPORT_SYMBOL(subdev_8255_interrupt);

0 comments on commit 0ed117d

Please sign in to comment.