Skip to content

Commit

Permalink
drivers/staging/comedi: dev_node removal (das08_cs)
Browse files Browse the repository at this point in the history
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  • Loading branch information
Javier Martinez Canillas authored and Dominik Brodowski committed May 17, 2010
1 parent eb8804f commit df3f97a
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions drivers/staging/comedi/drivers/das08_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ static const dev_info_t dev_info = "pcm-das08";

struct local_info_t {
struct pcmcia_device *link;
dev_node_t node;
int stop;
struct bus_operations *bus;
};
Expand Down Expand Up @@ -203,10 +202,8 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)

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

if (link->dev_node) {
((struct local_info_t *)link->priv)->stop = 1;
das08_pcmcia_release(link);
}
((struct local_info_t *)link->priv)->stop = 1;
das08_pcmcia_release(link);

/* This points to the parent struct local_info_t struct */
if (link->priv)
Expand Down Expand Up @@ -261,7 +258,6 @@ static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev,

static void das08_pcmcia_config(struct pcmcia_device *link)
{
struct local_info_t *dev = link->priv;
int ret;

dev_dbg(&link->dev, "das08_pcmcia_config\n");
Expand All @@ -284,17 +280,8 @@ static void das08_pcmcia_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, "pcm-das08");
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 %u", link->irq);
if (link->io.NumPorts1)
Expand Down

0 comments on commit df3f97a

Please sign in to comment.