aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2010-04-30 16:30:23 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-05-17 09:44:51 -0400
commitdf3f97a2d65c52d7cdaf80907151281b5d449222 (patch)
tree7f12e5ff037dcdf423603e412142dda01a3c99ff
parenteb8804f654a512a1a4e2f189d1bbaa41565e46b5 (diff)
drivers/staging/comedi: dev_node removal (das08_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/das08_cs.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index bd69c4fdcbf5..896d25bc85b5 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -142,7 +142,6 @@ static const dev_info_t dev_info = "pcm-das08";
142 142
143struct local_info_t { 143struct local_info_t {
144 struct pcmcia_device *link; 144 struct pcmcia_device *link;
145 dev_node_t node;
146 int stop; 145 int stop;
147 struct bus_operations *bus; 146 struct bus_operations *bus;
148}; 147};
@@ -203,10 +202,8 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)
203 202
204 dev_dbg(&link->dev, "das08_pcmcia_detach\n"); 203 dev_dbg(&link->dev, "das08_pcmcia_detach\n");
205 204
206 if (link->dev_node) { 205 ((struct local_info_t *)link->priv)->stop = 1;
207 ((struct local_info_t *)link->priv)->stop = 1; 206 das08_pcmcia_release(link);
208 das08_pcmcia_release(link);
209 }
210 207
211 /* This points to the parent struct local_info_t struct */ 208 /* This points to the parent struct local_info_t struct */
212 if (link->priv) 209 if (link->priv)
@@ -261,7 +258,6 @@ static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev,
261 258
262static void das08_pcmcia_config(struct pcmcia_device *link) 259static void das08_pcmcia_config(struct pcmcia_device *link)
263{ 260{
264 struct local_info_t *dev = link->priv;
265 int ret; 261 int ret;
266 262
267 dev_dbg(&link->dev, "das08_pcmcia_config\n"); 263 dev_dbg(&link->dev, "das08_pcmcia_config\n");
@@ -284,17 +280,8 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
284 if (ret) 280 if (ret)
285 goto failed; 281 goto failed;
286 282
287 /*
288 At this point, the dev_node_t structure(s) need to be
289 initialized and arranged in a linked list at link->dev.
290 */
291 sprintf(dev->node.dev_name, "pcm-das08");
292 dev->node.major = dev->node.minor = 0;
293 link->dev_node = &dev->node;
294
295 /* Finally, report what we've done */ 283 /* Finally, report what we've done */
296 printk(KERN_INFO "%s: index 0x%02x", 284 dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
297 dev->node.dev_name, link->conf.ConfigIndex);
298 if (link->conf.Attributes & CONF_ENABLE_IRQ) 285 if (link->conf.Attributes & CONF_ENABLE_IRQ)
299 printk(", irq %u", link->irq); 286 printk(", irq %u", link->irq);
300 if (link->io.NumPorts1) 287 if (link->io.NumPorts1)