diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-20 19:43:40 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-05-10 10:23:17 +0200 |
| commit | b9300aa7449f6636b188743d09199dcf27b1a4b4 (patch) | |
| tree | 96cf66eb6701b7e575e4dc65731730d0f9b62860 /drivers | |
| parent | b498ada6d0cf0f9828b0c590f9fa2e84f60f5709 (diff) | |
| download | linux-3.10-b9300aa7449f6636b188743d09199dcf27b1a4b4.tar.gz linux-3.10-b9300aa7449f6636b188743d09199dcf27b1a4b4.tar.bz2 linux-3.10-b9300aa7449f6636b188743d09199dcf27b1a4b4.zip | |
pcmcia: dev_node removal (core)
Remove the dev_node declaration. We now only pass the device name
to the deprecated userspace tools.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/ds.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 15 |
2 files changed, 3 insertions, 14 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index a2649c7b05b..0e12d85dd72 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -371,8 +371,6 @@ static int pcmcia_device_remove(struct device *dev) if (p_drv->remove) p_drv->remove(p_dev); - p_dev->dev_node = NULL; - /* check for proper unloading */ if (p_dev->_irq || p_dev->_io || p_dev->_locked) dev_printk(KERN_INFO, dev, diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index fe98aa9b1ae..a42a6c7be10 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c @@ -571,7 +571,6 @@ static struct pci_bus *pcmcia_lookup_bus(struct pcmcia_socket *s) static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int first) { - dev_node_t *node; struct pcmcia_device *p_dev; struct pcmcia_driver *p_drv; int ret = 0; @@ -633,21 +632,13 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int goto err_put; } - if (first) - node = p_dev->dev_node; - else - for (node = p_dev->dev_node; node; node = node->next) - if (node == bind_info->next) - break; - if (!node) { + if (!first) { ret = -ENODEV; goto err_put; } - strlcpy(bind_info->name, node->dev_name, DEV_NAME_LEN); - bind_info->major = node->major; - bind_info->minor = node->minor; - bind_info->next = node->next; + strlcpy(bind_info->name, dev_name(&p_dev->dev), DEV_NAME_LEN); + bind_info->next = NULL; err_put: pcmcia_put_dev(p_dev); |