diff options
Diffstat (limited to 'drivers/char/pcmcia/cm4000_cs.c')
-rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 90b199f97bec..e7956acf2ad6 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -106,7 +106,6 @@ static int major; /* major number we get from the kernel */ | |||
106 | 106 | ||
107 | struct cm4000_dev { | 107 | struct cm4000_dev { |
108 | struct pcmcia_device *p_dev; | 108 | struct pcmcia_device *p_dev; |
109 | dev_node_t node; /* OS node (major,minor) */ | ||
110 | 109 | ||
111 | unsigned char atr[MAX_ATR]; | 110 | unsigned char atr[MAX_ATR]; |
112 | unsigned char rbuf[512]; | 111 | unsigned char rbuf[512]; |
@@ -884,8 +883,7 @@ static void monitor_card(unsigned long p) | |||
884 | /* slow down warning, but prompt immediately after insertion */ | 883 | /* slow down warning, but prompt immediately after insertion */ |
885 | if (dev->cwarn == 0 || dev->cwarn == 10) { | 884 | if (dev->cwarn == 0 || dev->cwarn == 10) { |
886 | set_bit(IS_BAD_CARD, &dev->flags); | 885 | set_bit(IS_BAD_CARD, &dev->flags); |
887 | printk(KERN_WARNING MODULE_NAME ": device %s: ", | 886 | dev_warn(&dev->p_dev->dev, MODULE_NAME ": "); |
888 | dev->node.dev_name); | ||
889 | if (test_bit(IS_BAD_CSUM, &dev->flags)) { | 887 | if (test_bit(IS_BAD_CSUM, &dev->flags)) { |
890 | DEBUGP(4, dev, "ATR checksum (0x%.2x, should " | 888 | DEBUGP(4, dev, "ATR checksum (0x%.2x, should " |
891 | "be zero) failed\n", dev->atr_csum); | 889 | "be zero) failed\n", dev->atr_csum); |
@@ -1781,11 +1779,6 @@ static int cm4000_config(struct pcmcia_device * link, int devno) | |||
1781 | goto cs_release; | 1779 | goto cs_release; |
1782 | 1780 | ||
1783 | dev = link->priv; | 1781 | dev = link->priv; |
1784 | sprintf(dev->node.dev_name, DEVICE_NAME "%d", devno); | ||
1785 | dev->node.major = major; | ||
1786 | dev->node.minor = devno; | ||
1787 | dev->node.next = NULL; | ||
1788 | link->dev_node = &dev->node; | ||
1789 | 1782 | ||
1790 | return 0; | 1783 | return 0; |
1791 | 1784 | ||