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>

diff --git a/drivers/staging/octeon/ethernet-xaui.c b/drivers/staging/octeon/ethernet-xaui.c
index 9097edf102302f5de79c1a790ed8f3c5b516931d..c26d1e666cd7f8c043d853b522651b2e06e7c8d5 100644 (file)
--- 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 9dc5cc927b9bedcbecdf3649c4ff1bde2135278d..d6f8a10a60b305cf99b1e488a2a4a217b2d85b94 100644 (file)
--- 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 67f640f1c668d32f6f4648d4b7016f75a48a7c95..dfb808f4ee5cb45174ff25e880745c0565fde720 100644 (file)
--- 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);