pcmcia: dev_node removal (drivers with updated printk call)

As a second step, remove any usage of dev_node_t from drivers which
only wrote to this typedef/struct, except one printk() which can
easily be replaced by a dev_info()/dev_warn() call.

CC: Harald Welte <laforge@gnumonks.org>
CC: linux-ide@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-usb@vger.kernel.org
Acked-by: Karsten Keil  <isdn@linux-pingi.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

2 files changed, 3 insertions, 16 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 */
 
 struct cm4000_dev {
         struct pcmcia_device *p_dev;
-        dev_node_t node;                /* OS node (major,minor) */
 
         unsigned char atr[MAX_ATR];
         unsigned char rbuf[512];
@@ -884,8 +883,7 @@ static void monitor_card(unsigned long p)
                 /* slow down warning, but prompt immediately after insertion */
                 if (dev->cwarn == 0 || dev->cwarn == 10) {
                         set_bit(IS_BAD_CARD, &dev->flags);
-                        printk(KERN_WARNING MODULE_NAME ": device %s: ",
-                               dev->node.dev_name);
+                        dev_warn(&dev->p_dev->dev, MODULE_NAME ": ");
                         if (test_bit(IS_BAD_CSUM, &dev->flags)) {
                                 DEBUGP(4, dev, "ATR checksum (0x%.2x, should "
                                        "be zero) failed\n", dev->atr_csum);
@@ -1781,11 +1779,6 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
                 goto cs_release;
 
         dev = link->priv;
-        sprintf(dev->node.dev_name, DEVICE_NAME "%d", devno);
-        dev->node.major = major;
-        dev->node.minor = devno;
-        dev->node.next = NULL;
-        link->dev_node = &dev->node;
 
         return 0;
 
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 027690b70d2c..308903ec8bf8 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -220,7 +220,6 @@ typedef struct _mgslpc_info {
 
         /* PCMCIA support */
         struct pcmcia_device    *p_dev;
-        dev_node_t            node;
         int                   stop;
 
         /* SPPP/Cisco HDLC device parts */
@@ -614,13 +613,8 @@ static int mgslpc_config(struct pcmcia_device *link)
     info->io_base = link->io.BasePort1;
     info->irq_level = link->irq;
 
-    /* add to linked list of devices */
-    sprintf(info->node.dev_name, "mgslpc0");
-    info->node.major = info->node.minor = 0;
-    link->dev_node = &info->node;
-
-    printk(KERN_INFO "%s: index 0x%02x:",
-           info->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 %d", link->irq);
     if (link->io.NumPorts1)