[PATCH 2/2] staging: octeon-ethernet: xaui: use common init

Aaro Koskinen aaro.koskinen at nokia.com
Mon Oct 12 13:12:34 UTC 2015


Use common init.

Signed-off-by: Aaro Koskinen <aaro.koskinen at nokia.com>
---
 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 c9183e0..77b65cd 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.4.3



More information about the devel mailing list