From: Steven Rostedt <rostedt@goodmis.org>
To: LKML <linux-kernel@vger.kernel.org>, netdev <netdev@vger.kernel.org>
Cc: Felix Fietkau <nbd@openwrt.org>,
Ivo van Doorn <IvDoorn@gmail.com>,
"John W. Linville" <linville@tuxdriver.com>,
abogani@texware.it
Subject: [PATCH] rt2x00: Use ops name instead of device name
Date: Tue, 22 Feb 2011 08:12:48 -0500 [thread overview]
Message-ID: <1298380368.6140.1193.camel@gandalf.stny.rr.com> (raw)
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@goodmis.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);
next reply other threads:[~2011-02-22 13:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-22 13:12 Steven Rostedt [this message]
2011-02-22 13:34 ` [PATCH] rt2x00: Use ops name instead of device name Ben Hutchings
2011-02-22 13:44 ` Steven Rostedt
2011-02-22 19:33 ` Ivo Van Doorn
2011-02-22 19:47 ` John W. Linville
2011-02-22 21:08 ` Steven Rostedt
2011-02-22 19:52 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298380368.6140.1193.camel@gandalf.stny.rr.com \
--to=rostedt@goodmis.org \
--cc=IvDoorn@gmail.com \
--cc=abogani@texware.it \
--cc=linux-kernel@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=nbd@openwrt.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox