diff options
| author | Aaro Koskinen <aaro.koskinen@nokia.com> | 2015-10-12 16:12:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 20:52:39 -0700 |
| commit | 41cb5786550ef67f970a2c1446f480d1ee0e2b69 (patch) | |
| tree | 7927a06ad8b864fa1cf9a683aaa8645d0c1b2ab9 /drivers/staging | |
| parent | d4583edb221eb7297bcbc6f0febe895a96fed5f7 (diff) | |
staging: octeon-ethernet: xaui: use common init
Use common init.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/octeon/ethernet-xaui.c | 7 | ||||
| -rw-r--r-- | drivers/staging/octeon/ethernet.c | 2 | ||||
| -rw-r--r-- | drivers/staging/octeon/octeon-ethernet.h | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/octeon/ethernet-xaui.c b/drivers/staging/octeon/ethernet-xaui.c index 9097edf10230..c26d1e666cd7 100644 --- a/drivers/staging/octeon/ethernet-xaui.c +++ b/drivers/staging/octeon/ethernet-xaui.c @@ -29,10 +29,3 @@ int cvm_oct_xaui_open(struct net_device *dev) { return cvm_oct_common_open(dev, cvm_oct_link_poll, true); } - -int cvm_oct_xaui_init(struct net_device *dev) -{ - cvm_oct_common_init(dev); - - return 0; -} diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 9dc5cc927b9b..d6f8a10a60b3 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -554,7 +554,7 @@ static const struct net_device_ops cvm_oct_npi_netdev_ops = { #endif }; static const struct net_device_ops cvm_oct_xaui_netdev_ops = { - .ndo_init = cvm_oct_xaui_init, + .ndo_init = cvm_oct_common_init, .ndo_uninit = cvm_oct_common_uninit, .ndo_open = cvm_oct_xaui_open, .ndo_stop = cvm_oct_common_stop, diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h index 67f640f1c668..dfb808f4ee5c 100644 --- a/drivers/staging/octeon/octeon-ethernet.h +++ b/drivers/staging/octeon/octeon-ethernet.h @@ -62,7 +62,6 @@ int cvm_oct_sgmii_open(struct net_device *dev); int cvm_oct_spi_init(struct net_device *dev); void cvm_oct_spi_uninit(struct net_device *dev); -int cvm_oct_xaui_init(struct net_device *dev); int cvm_oct_xaui_open(struct net_device *dev); int cvm_oct_common_init(struct net_device *dev); |