From 41cb5786550ef67f970a2c1446f480d1ee0e2b69 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Mon, 12 Oct 2015 16:12:34 +0300 Subject: [PATCH] staging: octeon-ethernet: xaui: use common init Use common init. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/octeon/ethernet-xaui.c | 7 ------- drivers/staging/octeon/ethernet.c | 2 +- drivers/staging/octeon/octeon-ethernet.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/octeon/ethernet-xaui.c b/drivers/staging/octeon/ethernet-xaui.c index 9097edf..c26d1e6 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 9dc5cc9..d6f8a10 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 67f640f..dfb808f 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); -- 2.7.4