aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2010-04-30 16:30:40 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-05-17 09:44:52 -0400
commitcdc268b4a029d489798db10d10fea72b7a415ab9 (patch)
tree916bc135d0a41b8af5c2e38fdca4cba7b85a3806
parentdf3f97a2d65c52d7cdaf80907151281b5d449222 (diff)
drivers/staging/comedi: dev_node removal (ni_daq_700)
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_daq_700.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 072bc4b62011..06dd44ff1a95 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -470,7 +470,6 @@ static const dev_info_t dev_info = "ni_daq_700";
470 470
471struct local_info_t { 471struct local_info_t {
472 struct pcmcia_device *link; 472 struct pcmcia_device *link;
473 dev_node_t node;
474 int stop; 473 int stop;
475 struct bus_operations *bus; 474 struct bus_operations *bus;
476}; 475};
@@ -535,10 +534,8 @@ static void dio700_cs_detach(struct pcmcia_device *link)
535 534
536 dev_dbg(&link->dev, "dio700_cs_detach\n"); 535 dev_dbg(&link->dev, "dio700_cs_detach\n");
537 536
538 if (link->dev_node) { 537 ((struct local_info_t *)link->priv)->stop = 1;
539 ((struct local_info_t *)link->priv)->stop = 1; 538 dio700_release(link);
540 dio700_release(link);
541 }
542 539
543 /* This points to the parent struct local_info_t struct */ 540 /* This points to the parent struct local_info_t struct */
544 if (link->priv) 541 if (link->priv)
@@ -620,7 +617,6 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev,
620 617
621static void dio700_config(struct pcmcia_device *link) 618static void dio700_config(struct pcmcia_device *link)
622{ 619{
623 struct local_info_t *dev = link->priv;
624 win_req_t req; 620 win_req_t req;
625 int ret; 621 int ret;
626 622
@@ -646,17 +642,8 @@ static void dio700_config(struct pcmcia_device *link)
646 if (ret != 0) 642 if (ret != 0)
647 goto failed; 643 goto failed;
648 644
649 /*
650 At this point, the dev_node_t structure(s) need to be
651 initialized and arranged in a linked list at link->dev.
652 */
653 sprintf(dev->node.dev_name, "ni_daq_700");
654 dev->node.major = dev->node.minor = 0;
655 link->dev_node = &dev->node;
656
657 /* Finally, report what we've done */ 645 /* Finally, report what we've done */
658 printk(KERN_INFO "%s: index 0x%02x", 646 dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
659 dev->node.dev_name, link->conf.ConfigIndex);
660 if (link->conf.Attributes & CONF_ENABLE_IRQ) 647 if (link->conf.Attributes & CONF_ENABLE_IRQ)
661 printk(", irq %d", link->irq); 648 printk(", irq %d", link->irq);
662 if (link->io.NumPorts1) 649 if (link->io.NumPorts1)