aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2010-04-30 16:31:37 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-05-17 09:44:57 -0400
commitbfc2cc3497dfa7800faa9d2915e997d65daaf56e (patch)
tree8c406365abd575fe906340a7f233ee2f8c6c06bc
parent99bd8f22220efc214130488c3d65d6acc34ea893 (diff)
drivers/staging/comedi: dev_node removal (ni_mio_cs)
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--drivers/staging/comedi/drivers/ni_mio_cs.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index a6007abce34a..1e8aebae8ae8 100644
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -262,11 +262,6 @@ static void cs_detach(struct pcmcia_device *);
262 262
263static struct pcmcia_device *cur_dev = NULL; 263static struct pcmcia_device *cur_dev = NULL;
264static const dev_info_t dev_info = "ni_mio_cs"; 264static const dev_info_t dev_info = "ni_mio_cs";
265static dev_node_t dev_node = {
266 "ni_mio_cs",
267 COMEDI_MAJOR, 0,
268 NULL
269};
270 265
271static int cs_attach(struct pcmcia_device *link) 266static int cs_attach(struct pcmcia_device *link)
272{ 267{
@@ -291,8 +286,7 @@ static void cs_detach(struct pcmcia_device *link)
291{ 286{
292 DPRINTK("cs_detach(link=%p)\n", link); 287 DPRINTK("cs_detach(link=%p)\n", link);
293 288
294 if (link->dev_node) 289 cs_release(link);
295 cs_release(link);
296} 290}
297 291
298static int mio_cs_suspend(struct pcmcia_device *link) 292static int mio_cs_suspend(struct pcmcia_device *link)
@@ -347,8 +341,6 @@ static void mio_cs_config(struct pcmcia_device *link)
347 dev_info(&link->dev, "no IRQ available\n"); 341 dev_info(&link->dev, "no IRQ available\n");
348 342
349 ret = pcmcia_request_configuration(link, &link->conf); 343 ret = pcmcia_request_configuration(link, &link->conf);
350
351 link->dev_node = &dev_node;
352} 344}
353 345
354static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) 346static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)