From 7c1e5b67a4a576440ad4a141acc4eb142e199622 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 4 Feb 2013 14:22:17 -0700 Subject: [PATCH] --- yaml --- r: 354366 b: refs/heads/master c: 5056d87a889d1bd7d998070b6827b384ccde487f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_daq_700.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d40bfcce4fcb..59b6b6ead47b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dc99109f53535f888bc13ea2aad3632acdda475 +refs/heads/master: 5056d87a889d1bd7d998070b6827b384ccde487f diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c index 0fe2888dd207..c8f4c7d2a832 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c @@ -245,16 +245,11 @@ static int daq700_auto_attach(struct comedi_device *dev, return 0; } -static void daq700_detach(struct comedi_device *dev) -{ - comedi_pcmcia_disable(dev); -} - static struct comedi_driver daq700_driver = { .driver_name = "ni_daq_700", .module = THIS_MODULE, .auto_attach = daq700_auto_attach, - .detach = daq700_detach, + .detach = comedi_pcmcia_disable, }; static int daq700_cs_attach(struct pcmcia_device *link)