Patchwork [01/30] 3c503, smc-ultra: netdev_ops bugs

login
register
mail settings
Submitter Stephen Hemminger
Date March 27, 2009, 1:11 a.m.
Message ID <20090327011255.025012534@linux-foundation.org>
Download mbox | patch
Permalink /patch/25186/
State Accepted
Delegated to: David Miller
Headers show

Comments

Stephen Hemminger - March 27, 2009, 1:11 a.m.
A couple of drivers have leftovers from netdev ops conversion.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>



--
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 - March 27, 2009, 7:50 a.m.
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 26 Mar 2009 18:11:15 -0700

> A couple of drivers have leftovers from netdev ops conversion.
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
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

--- a/drivers/net/3c503.c	2009-03-21 12:36:56.000000000 -0700
+++ b/drivers/net/3c503.c	2009-03-26 15:59:32.550403332 -0700
@@ -353,9 +353,6 @@  el2_probe1(struct net_device *dev, int i
 
     dev->netdev_ops = &el2_netdev_ops;
     dev->ethtool_ops = &netdev_ethtool_ops;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-    dev->poll_controller = eip_poll;
-#endif
 
     retval = register_netdev(dev);
     if (retval)
--- a/drivers/net/smc-ultra.c	2009-03-21 12:37:00.000000000 -0700
+++ b/drivers/net/smc-ultra.c	2009-03-26 17:03:51.633589602 -0700
@@ -142,9 +142,6 @@  static int __init do_ultra_probe(struct 
 	int base_addr = dev->base_addr;
 	int irq = dev->irq;
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = &ultra_poll;
-#endif
 	if (base_addr > 0x1ff)		/* Check a single specified location. */
 		return ultra_probe1(dev, base_addr);
 	else if (base_addr != 0)	/* Don't probe at all. */