diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-20 14:43:40 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-05-10 04:23:17 -0400 |
commit | b9300aa7449f6636b188743d09199dcf27b1a4b4 (patch) | |
tree | 96cf66eb6701b7e575e4dc65731730d0f9b62860 /drivers/pcmcia/pcmcia_ioctl.c | |
parent | b498ada6d0cf0f9828b0c590f9fa2e84f60f5709 (diff) |
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/pcmcia/pcmcia_ioctl.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index fe98aa9b1aef..a42a6c7be10a 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) | |||
571 | 571 | ||
572 | static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int first) | 572 | static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int first) |
573 | { | 573 | { |
574 | dev_node_t *node; | ||
575 | struct pcmcia_device *p_dev; | 574 | struct pcmcia_device *p_dev; |
576 | struct pcmcia_driver *p_drv; | 575 | struct pcmcia_driver *p_drv; |
577 | int ret = 0; | 576 | int ret = 0; |
@@ -633,21 +632,13 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int | |||
633 | goto err_put; | 632 | goto err_put; |
634 | } | 633 | } |
635 | 634 | ||
636 | if (first) | 635 | if (!first) { |
637 | node = p_dev->dev_node; | ||
638 | else | ||
639 | for (node = p_dev->dev_node; node; node = node->next) | ||
640 | if (node == bind_info->next) | ||
641 | break; | ||
642 | if (!node) { | ||
643 | ret = -ENODEV; | 636 | ret = -ENODEV; |
644 | goto err_put; | 637 | goto err_put; |
645 | } | 638 | } |
646 | 639 | ||
647 | strlcpy(bind_info->name, node->dev_name, DEV_NAME_LEN); | 640 | strlcpy(bind_info->name, dev_name(&p_dev->dev), DEV_NAME_LEN); |
648 | bind_info->major = node->major; | 641 | bind_info->next = NULL; |
649 | bind_info->minor = node->minor; | ||
650 | bind_info->next = node->next; | ||
651 | 642 | ||
652 | err_put: | 643 | err_put: |
653 | pcmcia_put_dev(p_dev); | 644 | pcmcia_put_dev(p_dev); |