Patchwork 3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)

login
register
mail settings
Submitter Matthew Whitehead
Date April 23, 2013, 5:49 p.m.
Message ID <CAP8WD_ZJo_RaShD-V5fn4OUySt8_RCdjyZvVpijhhQEZQZHkbQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/238973/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Matthew Whitehead - April 23, 2013, 5:49 p.m.
The venerable 3c509 driver only sets its device parent in one case,
the ISAPnP one.
It does this with the SET_NETDEV_DEV function. It should register with
the device
hierarchy in two additional cases: standard (non-PnP) ISA and EISA.

- Currently they appear here:
/sys/devices/virtual/net/eth0 (standard ISA)
/sys/devices/virtual/net/eth1 (EISA)

- Rather, they should instead be here:
/sys/devices/isa/3c509.0/net/eth0 (standard ISA)
/sys/devices/pci0000:00/0000:00:07.0/00:04/net/eth1 (EISA)

Tested on ISA and EISA boards.

Signed-off-by: Matthew Whitehead <tedheadster@gmail.com>
---
 drivers/net/ethernet/3com/3c509.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

        if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-isa")) {
@@ -595,6 +596,7 @@ static int __init el3_eisa_probe (struct device *device)
                return -ENOMEM;
        }

+       SET_NETDEV_DEV(dev, device);
        netdev_boot_setup_check(dev);

        el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_EISA);
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - April 25, 2013, 5:45 a.m.
From: Matthew Whitehead <tedheadster@gmail.com>
Date: Tue, 23 Apr 2013 13:49:39 -0400

> Tested on ISA and EISA boards.

You didn't actually test "this" patch.

> @@ -306,6 +306,7 @@ static int el3_isa_match(struct device *pdev,
> unsigned int ndev)

Because it was corrupted by your email client, long lines were
chopped up, etc.

Please fix this, send a test patch to yourself, and do not resubmit
this patch here until you are able to successfully apply the patch
you receive in those test emails.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/3com/3c509.c
b/drivers/net/ethernet/3com/3c509.c
index f36ff99..adb4bf5 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -306,6 +306,7 @@  static int el3_isa_match(struct device *pdev,
unsigned int ndev)
        if (!dev)
                return -ENOMEM;

+       SET_NETDEV_DEV(dev, pdev);
        netdev_boot_setup_check(dev);