mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 00:39:48 +00:00
Code Issues Releases Wiki Activity

staging: octeon-ethernet: move ndo_stop to common init

Browse source 
All init functions call ndo_stop if it's defined, so move it
to common function.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2015-04-04 22:51:04 +03:00 committed by Greg Kroah-Hartman
parent 96217ebff7
commit be76400c31
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/octeon/ethernet-rgmii.c
View file

@ -314,7 +314,6 @@ int cvm_oct_rgmii_init(struct net_device *dev)
int r;
cvm_oct_common_init(dev);
dev->netdev_ops->ndo_stop(dev);
INIT_WORK(&priv->port_work, cvm_oct_rgmii_immediate_poll);
/*
* Due to GMX errata in CN3XXX series chips, it is necessary

1
drivers/staging/octeon/ethernet-sgmii.c
View file

@ -85,7 +85,6 @@ int cvm_oct_sgmii_open(struct net_device *dev)
int cvm_oct_sgmii_init(struct net_device *dev)
{
cvm_oct_common_init(dev);
dev->netdev_ops->ndo_stop(dev);
/* FIXME: Need autoneg logic */
return 0;

1
drivers/staging/octeon/ethernet-xaui.c
View file

@ -87,7 +87,6 @@ int cvm_oct_xaui_init(struct net_device *dev)
struct octeon_ethernet *priv = netdev_priv(dev);
cvm_oct_common_init(dev);
dev->netdev_ops->ndo_stop(dev);
if (!octeon_is_simulation() && priv->phydev == NULL)
priv->poll = cvm_oct_xaui_poll;

3
drivers/staging/octeon/ethernet.c
View file

@ -488,6 +488,9 @@ int cvm_oct_common_init(struct net_device *dev)
memset(dev->netdev_ops->ndo_get_stats(dev), 0,
sizeof(struct net_device_stats));
if (dev->netdev_ops->ndo_stop)
dev->netdev_ops->ndo_stop(dev);
return 0;
}