mirror of https://gitee.com/openkylin/linux.git
3c503, smc-ultra: netdev_ops bugs
A couple of drivers have leftovers from netdev ops conversion. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
58add9fc02
commit
1ace90fe0a
|
@ -353,9 +353,6 @@ el2_probe1(struct net_device *dev, int ioaddr)
|
||||||
|
|
||||||
dev->netdev_ops = &el2_netdev_ops;
|
dev->netdev_ops = &el2_netdev_ops;
|
||||||
dev->ethtool_ops = &netdev_ethtool_ops;
|
dev->ethtool_ops = &netdev_ethtool_ops;
|
||||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
||||||
dev->poll_controller = eip_poll;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
retval = register_netdev(dev);
|
retval = register_netdev(dev);
|
||||||
if (retval)
|
if (retval)
|
||||||
|
|
|
@ -142,9 +142,6 @@ static int __init do_ultra_probe(struct net_device *dev)
|
||||||
int base_addr = dev->base_addr;
|
int base_addr = dev->base_addr;
|
||||||
int irq = dev->irq;
|
int irq = dev->irq;
|
||||||
|
|
||||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
||||||
dev->poll_controller = &ultra_poll;
|
|
||||||
#endif
|
|
||||||
if (base_addr > 0x1ff) /* Check a single specified location. */
|
if (base_addr > 0x1ff) /* Check a single specified location. */
|
||||||
return ultra_probe1(dev, base_addr);
|
return ultra_probe1(dev, base_addr);
|
||||||
else if (base_addr != 0) /* Don't probe at all. */
|
else if (base_addr != 0) /* Don't probe at all. */
|
||||||
|
|
Loading…
Reference in New Issue