From 5e87b15ce11adbd51358793bc8b0a26ae856e3bd Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 30 Apr 2010 16:31:37 -0400 Subject: [PATCH] --- yaml --- r: 192532 b: refs/heads/master c: bfc2cc3497dfa7800faa9d2915e997d65daaf56e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_mio_cs.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 37b266b3ecdd..303317012274 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99bd8f22220efc214130488c3d65d6acc34ea893 +refs/heads/master: bfc2cc3497dfa7800faa9d2915e997d65daaf56e diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c index a6007abce34a..1e8aebae8ae8 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -262,11 +262,6 @@ static void cs_detach(struct pcmcia_device *); static struct pcmcia_device *cur_dev = NULL; static const dev_info_t dev_info = "ni_mio_cs"; -static dev_node_t dev_node = { - "ni_mio_cs", - COMEDI_MAJOR, 0, - NULL -}; static int cs_attach(struct pcmcia_device *link) { @@ -291,8 +286,7 @@ static void cs_detach(struct pcmcia_device *link) { DPRINTK("cs_detach(link=%p)\n", link); - if (link->dev_node) - cs_release(link); + cs_release(link); } static int mio_cs_suspend(struct pcmcia_device *link) @@ -347,8 +341,6 @@ static void mio_cs_config(struct pcmcia_device *link) dev_info(&link->dev, "no IRQ available\n"); ret = pcmcia_request_configuration(link, &link->conf); - - link->dev_node = &dev_node; } static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)