diff options
| author | Pavel Roskin <proski@gnu.org> | 2006-05-01 02:13:26 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 17:10:40 -0400 |
| commit | 9a568da2097ad3701ca575cb6d360d56ffeee446 (patch) | |
| tree | 063cf2e349753d83d6306baf06ccf0d84a4c7abb | |
| parent | e4f4f98efdb4619ab95eb724fd5e0c4675307cc1 (diff) | |
[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>
| -rw-r--r-- | drivers/net/wireless/orinoco_cs.c | 17 | ||||
| -rw-r--r-- | drivers/net/wireless/spectrum_cs.c | 17 |
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) | |||
| 343 | net_device has been registered */ | 343 | net_device has been registered */ |
| 344 | 344 | ||
| 345 | /* Finally, report what we've done */ | 345 | /* Finally, report what we've done */ |
| 346 | printk(KERN_DEBUG "%s: index 0x%02x: ", | 346 | printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io " |
| 347 | dev->name, link->conf.ConfigIndex); | 347 | "0x%04x-0x%04x\n", dev->name, dev->class_dev.dev->bus_id, |
| 348 | if (link->conf.Vpp) | 348 | link->irq.AssignedIRQ, link->io.BasePort1, |
| 349 | printk(", Vpp %d.%d", link->conf.Vpp / 10, | 349 | link->io.BasePort1 + link->io.NumPorts1 - 1); |
| 350 | link->conf.Vpp % 10); | ||
| 351 | printk(", irq %d", link->irq.AssignedIRQ); | ||
| 352 | if (link->io.NumPorts1) | ||
| 353 | printk(", io 0x%04x-0x%04x", link->io.BasePort1, | ||
| 354 | link->io.BasePort1 + link->io.NumPorts1 - 1); | ||
| 355 | if (link->io.NumPorts2) | ||
| 356 | printk(" & 0x%04x-0x%04x", link->io.BasePort2, | ||
| 357 | link->io.BasePort2 + link->io.NumPorts2 - 1); | ||
| 358 | printk("\n"); | ||
| 359 | 350 | ||
| 360 | return 0; | 351 | return 0; |
| 361 | 352 | ||
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) | |||
| 822 | net_device has been registered */ | 822 | net_device has been registered */ |
| 823 | 823 | ||
| 824 | /* Finally, report what we've done */ | 824 | /* Finally, report what we've done */ |
| 825 | printk(KERN_DEBUG "%s: index 0x%02x: ", | 825 | printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io " |
| 826 | dev->name, link->conf.ConfigIndex); | 826 | "0x%04x-0x%04x\n", dev->name, dev->class_dev.dev->bus_id, |
| 827 | if (link->conf.Vpp) | 827 | link->irq.AssignedIRQ, link->io.BasePort1, |
| 828 | printk(", Vpp %d.%d", link->conf.Vpp / 10, | 828 | link->io.BasePort1 + link->io.NumPorts1 - 1); |
| 829 | link->conf.Vpp % 10); | ||
| 830 | printk(", irq %d", link->irq.AssignedIRQ); | ||
| 831 | if (link->io.NumPorts1) | ||
| 832 | printk(", io 0x%04x-0x%04x", link->io.BasePort1, | ||
| 833 | link->io.BasePort1 + link->io.NumPorts1 - 1); | ||
| 834 | if (link->io.NumPorts2) | ||
| 835 | printk(" & 0x%04x-0x%04x", link->io.BasePort2, | ||
| 836 | link->io.BasePort2 + link->io.NumPorts2 - 1); | ||
| 837 | printk("\n"); | ||
| 838 | 829 | ||
| 839 | return 0; | 830 | return 0; |
| 840 | 831 | ||