[PATCH] orinoco: report more relevant data on startup

Report only the first I/O window and IRQ, and also add the driver name.
The second I/O window, Vpp and configuration index are not interesting
to most users.  They can be found by PCMCIA debug tools if needed.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 8 insertions, 26 deletions

diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index ee05ec6eda9d..1c19c76d47af 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -343,19 +343,10 @@ orinoco_cs_config(struct pcmcia_device *link)
                                     net_device has been registered */
 
         /* Finally, report what we've done */
-        printk(KERN_DEBUG "%s: index 0x%02x: ",
-               dev->name, link->conf.ConfigIndex);
-        if (link->conf.Vpp)
-                printk(", Vpp %d.%d", link->conf.Vpp / 10,
-                       link->conf.Vpp % 10);
-        printk(", irq %d", link->irq.AssignedIRQ);
-        if (link->io.NumPorts1)
-                printk(", io 0x%04x-0x%04x", link->io.BasePort1,
-                       link->io.BasePort1 + link->io.NumPorts1 - 1);
-        if (link->io.NumPorts2)
-                printk(" & 0x%04x-0x%04x", link->io.BasePort2,
-                       link->io.BasePort2 + link->io.NumPorts2 - 1);
-        printk("\n");
+        printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "
+               "0x%04x-0x%04x\n", dev->name, dev->class_dev.dev->bus_id,
+               link->irq.AssignedIRQ, link->io.BasePort1,
+               link->io.BasePort1 + link->io.NumPorts1 - 1);
 
         return 0;
 
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 0921162097fe..e9172eebfd01 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -822,19 +822,10 @@ spectrum_cs_config(struct pcmcia_device *link)
                                     net_device has been registered */
 
         /* Finally, report what we've done */
-        printk(KERN_DEBUG "%s: index 0x%02x: ",
-               dev->name, link->conf.ConfigIndex);
-        if (link->conf.Vpp)
-                printk(", Vpp %d.%d", link->conf.Vpp / 10,
-                       link->conf.Vpp % 10);
-        printk(", irq %d", link->irq.AssignedIRQ);
-        if (link->io.NumPorts1)
-                printk(", io 0x%04x-0x%04x", link->io.BasePort1,
-                       link->io.BasePort1 + link->io.NumPorts1 - 1);
-        if (link->io.NumPorts2)
-                printk(" & 0x%04x-0x%04x", link->io.BasePort2,
-                       link->io.BasePort2 + link->io.NumPorts2 - 1);
-        printk("\n");
+        printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "
+               "0x%04x-0x%04x\n", dev->name, dev->class_dev.dev->bus_id,
+               link->irq.AssignedIRQ, link->io.BasePort1,
+               link->io.BasePort1 + link->io.NumPorts1 - 1);
 
         return 0;