[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1298380368.6140.1193.camel@gandalf.stny.rr.com>
Date: Tue, 22 Feb 2011 08:12:48 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: LKML <linux-kernel@...r.kernel.org>,
netdev <netdev@...r.kernel.org>
Cc: Felix Fietkau <nbd@...nwrt.org>, Ivo van Doorn <IvDoorn@...il.com>,
"John W. Linville" <linville@...driver.com>, abogani@...ware.it
Subject: [PATCH] rt2x00: Use ops name instead of device name
Recently, someone complained that they see the PCI address of a device
in the interrupts file instead of the device name.
19: 73474106 0 IO-APIC-fasteoi ata_piix, uhci_hcd:usb6, 0000:05:01.0
>From lspci:
05:01.0 Network controller: RaLink RT2561/RT61 rev B 802.11g
Subsystem: D-Link System Inc AirPlus G DWL-G510 Wireless Network Adapter (Rev.C)
Flags: bus master, slow devsel, latency 32,
IRQ 19 Memory at f9100000 (32-bit, non-prefetchable) [size=32K]
Capabilities: <access denied>
Kernel driver in use: rt61pci
Kernel modules: rt61pci
Investigating this, it seems to be the result of the pci_name() used in
rt2x00pci_probe().
Since the struct rt2x00_ops records the module name for the device as
well as the ops, it would make more sense to show that in the interrupt
output instead.
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index ace0b66..06575dc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -284,7 +284,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
rt2x00dev->ops = ops;
rt2x00dev->hw = hw;
rt2x00dev->irq = pci_dev->irq;
- rt2x00dev->name = pci_name(pci_dev);
+ rt2x00dev->name = ops->name;
if (pci_is_pcie(pci_dev))
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists