Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304502
b: refs/heads/master
c: 597092f
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 30, 2012
1 parent add0145 commit 33c9912
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 24 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: b85eec95ec5520037611727399f21692316e0213
refs/heads/master: 597092fcc448ae4716274e2d80830b5bc54e5617
42 changes: 19 additions & 23 deletions trunk/drivers/staging/comedi/drivers/dt2817.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,6 @@ Configuration options:
#define DT2817_CR 0
#define DT2817_DATA 1

static int dt2817_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static int dt2817_detach(struct comedi_device *dev);
static struct comedi_driver driver_dt2817 = {
.driver_name = "dt2817",
.module = THIS_MODULE,
.attach = dt2817_attach,
.detach = dt2817_detach,
};

static int __init driver_dt2817_init_module(void)
{
return comedi_driver_register(&driver_dt2817);
}

static void __exit driver_dt2817_cleanup_module(void)
{
comedi_driver_unregister(&driver_dt2817);
}

module_init(driver_dt2817_init_module);
module_exit(driver_dt2817_cleanup_module);

static int dt2817_dio_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
Expand Down Expand Up @@ -192,6 +169,25 @@ static int dt2817_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_dt2817 = {
.driver_name = "dt2817",
.module = THIS_MODULE,
.attach = dt2817_attach,
.detach = dt2817_detach,
};

static int __init driver_dt2817_init_module(void)
{
return comedi_driver_register(&driver_dt2817);
}
module_init(driver_dt2817_init_module);

static void __exit driver_dt2817_cleanup_module(void)
{
comedi_driver_unregister(&driver_dt2817);
}
module_exit(driver_dt2817_cleanup_module);

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

0 comments on commit 33c9912

Please sign in to comment.