2013-10-01 20:40:51

by Kirill Tkhai

Subject: [PATCH] rt2x00_pci: Fix interrupt handler name (visible at /proc/interrupts)

Currently driver name is wrong. PCI device address is visible at
/proc/interrupts instead of the name:

43: 124 0 0 0 PCI-MSI-edge rtsx_pci
44: 384 0 0 0 PCI-MSI-edge snd_hda_intel
45: 25096 0 0 0 PCI-MSI-edge 0000:01:00.0
^^^^^^^^^^^^

So, pass the right name. rt2x00_ops->name contains KBUILD_MODNAME
and good for that, so pass it.

Handler names will be "rt2500pci", "rt2500pci" etc.

Signed-off-by: Kirill Tkhai <[email protected]>
CC: Ivo van Doorn <[email protected]>
CC: Gertjan van Wingerde <[email protected]>
CC: Helmut Schaa <[email protected]>
CC: [email protected]
---
drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 76d95de..6c5d667 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -121,7 +121,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
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);

2013-10-02 09:19:51

by Stanislaw Gruszka

Subject: Re: [PATCH] rt2x00_pci: Fix interrupt handler name (visible at /proc/interrupts)

On Wed, Oct 02, 2013 at 12:40:46AM +0400, Kirill Tkhai wrote:
> Currently driver name is wrong. PCI device address is visible at
> /proc/interrupts instead of the name:
>
> 43: 124 0 0 0 PCI-MSI-edge rtsx_pci
> 44: 384 0 0 0 PCI-MSI-edge snd_hda_intel
> 45: 25096 0 0 0 PCI-MSI-edge 0000:01:00.0
> ^^^^^^^^^^^^
>
> So, pass the right name. rt2x00_ops->name contains KBUILD_MODNAME
> and good for that, so pass it.
>
> Handler names will be "rt2500pci", "rt2500pci" etc.

Looks sane. I was afraid that is not possible to have two or more
interrupts with the same name, but that's not true.

Acked-by: Stanislaw Gruszka <[email protected]>

Stanislaw