Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364181
b: refs/heads/master
c: 79a8c0e
h: refs/heads/master
i:
  364179: 884033e
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 23, 2013
1 parent 048ff70 commit 565eeff
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 15 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: 7d0a66c0ccfd0ec23645ba2d92593c00d11bf936
refs/heads/master: 79a8c0e20eb9f0cb6aaaab87c56addff606d19fe
25 changes: 11 additions & 14 deletions trunk/drivers/staging/comedi/drivers/das800.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,20 +228,8 @@ struct das800_private {
volatile int do_bits; /* digital output bits */
};

static int das800_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s);

static struct comedi_driver driver_das800 = {
.driver_name = "das800",
.module = THIS_MODULE,
.attach = das800_attach,
.detach = comedi_legacy_detach,
.num_names = ARRAY_SIZE(das800_boards),
.board_name = &das800_boards[0].name,
.offset = sizeof(struct das800_board),
};

static irqreturn_t das800_interrupt(int irq, void *d);
static void enable_das800(struct comedi_device *dev);
static void disable_das800(struct comedi_device *dev);
Expand Down Expand Up @@ -329,8 +317,6 @@ static int das800_probe(struct comedi_device *dev)
return -1;
}

module_comedi_driver(driver_das800);

/* interrupt service routine */
static irqreturn_t das800_interrupt(int irq, void *d)
{
Expand Down Expand Up @@ -848,6 +834,17 @@ static int das800_set_frequency(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_das800 = {
.driver_name = "das800",
.module = THIS_MODULE,
.attach = das800_attach,
.detach = comedi_legacy_detach,
.num_names = ARRAY_SIZE(das800_boards),
.board_name = &das800_boards[0].name,
.offset = sizeof(struct das800_board),
};
module_comedi_driver(driver_das800);

MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
MODULE_LICENSE("GPL");

0 comments on commit 565eeff

Please sign in to comment.