Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78950591 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Dominik Brodowski
Browse files

drivers/staging/comedi: dev_node removal (ni_daq_dio24) 



Signed-off-by: default avatarJavier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent cdc268b4

drivers/staging/comedi/drivers/ni_daq_dio24.c

+3 −16
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ static const dev_info_t dev_info = "ni_daq_dio24"; 


struct local_info_t {

	struct pcmcia_device *link;

	dev_node_t node;

	int stop;

	struct bus_operations *bus;

};
@@ -286,10 +285,8 @@ static void dio24_cs_detach(struct pcmcia_device *link) 


	dev_dbg(&link->dev, "dio24_cs_detach\n");



	if (link->dev_node) {

	((struct local_info_t *)link->priv)->stop = 1;

	dio24_release(link);

	}



	/* This points to the parent local_info_t struct */

	if (link->priv)
@@ -371,7 +368,6 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev, 


static void dio24_config(struct pcmcia_device *link)

{

	struct local_info_t *dev = link->priv;

	int ret;

	win_req_t req;
@@ -397,17 +393,8 @@ static void dio24_config(struct pcmcia_device *link) 
	if (ret)

		goto failed;



	/*

	   At this point, the dev_node_t structure(s) need to be

	   initialized and arranged in a linked list at link->dev.

	 */

	sprintf(dev->node.dev_name, "ni_daq_dio24");

	dev->node.major = dev->node.minor = 0;

	link->dev_node = &dev->node;



	/* Finally, report what we've done */

	printk(KERN_INFO "%s: index 0x%02x",

	       dev->node.dev_name, link->conf.ConfigIndex);

	dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);

	if (link->conf.Attributes & CONF_ENABLE_IRQ)

		printk(", irq %d", link->irq);

	if (link->io.NumPorts1)