From f04d8913cb0c3801c4bb33ebf47f07929fdc9a81 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 26 Oct 2012 23:23:00 +0800 Subject: [PATCH] --- yaml --- r: 337299 b: refs/heads/master c: 3d568028ba910ab03b3186d0b8331acd8f0ec15e h: refs/heads/master i: 337297: 76cb359e689da754644fb87d26d62e2080b6c4f7 337295: 457ef99d207ca0e479437af9cc9f9c69612d41bc v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das800.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index ecb880c83a94..44d6769a1cf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c665814d750a5f5a378e0adfd5bedcf08cb177c3 +refs/heads/master: 3d568028ba910ab03b3186d0b8331acd8f0ec15e diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c index 1ba26b46fd9a..85ab24c4556a 100644 --- a/trunk/drivers/staging/comedi/drivers/das800.c +++ b/trunk/drivers/staging/comedi/drivers/das800.c @@ -342,22 +342,7 @@ static int das800_probe(struct comedi_device *dev) return -1; } -/* - * A convenient macro that defines init_module() and cleanup_module(), - * as necessary. - */ -static int __init driver_das800_init_module(void) -{ - return comedi_driver_register(&driver_das800); -} - -static void __exit driver_das800_cleanup_module(void) -{ - comedi_driver_unregister(&driver_das800); -} - -module_init(driver_das800_init_module); -module_exit(driver_das800_cleanup_module); +module_comedi_driver(driver_das800); /* interrupt service routine */ static irqreturn_t das800_interrupt(int irq, void *d)