staging: octeon-ethernet: delete sgmii and xaui specific uninit functions

Delete redundant wrappers.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/octeon/ethernet-sgmii.c b/drivers/staging/octeon/ethernet-sgmii.c
index cd791c36227325d4f8446717857f288fe87f3d93..1158eacc57bbfa9f6d404214d651de394efa718e 100644 (file)
--- a/drivers/staging/octeon/ethernet-sgmii.c
+++ b/drivers/staging/octeon/ethernet-sgmii.c
@@ -89,8 +89,3 @@ int cvm_oct_sgmii_init(struct net_device *dev)
        /* FIXME: Need autoneg logic */
        return 0;
 }
-
-void cvm_oct_sgmii_uninit(struct net_device *dev)
-{
-       cvm_oct_common_uninit(dev);
-}

diff --git a/drivers/staging/octeon/ethernet-xaui.c b/drivers/staging/octeon/ethernet-xaui.c
index 5782c38a9c9cadd440634c57b8a49acd4f6d8e48..3714fae201d4940d485f11f56a379ac767039bc8 100644 (file)
--- a/drivers/staging/octeon/ethernet-xaui.c
+++ b/drivers/staging/octeon/ethernet-xaui.c
@@ -92,8 +92,3 @@ int cvm_oct_xaui_init(struct net_device *dev)
 
        return 0;
 }
-
-void cvm_oct_xaui_uninit(struct net_device *dev)
-{
-       cvm_oct_common_uninit(dev);
-}

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index fdd23bfa62d1cdece20b973109dc2f08311761b5..a7f1fcb4762a8d89c224d41b9d231302e613e3bd 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -556,7 +556,7 @@ static const struct net_device_ops cvm_oct_npi_netdev_ops = {
 };
 static const struct net_device_ops cvm_oct_xaui_netdev_ops = {
        .ndo_init               = cvm_oct_xaui_init,
-       .ndo_uninit             = cvm_oct_xaui_uninit,
+       .ndo_uninit             = cvm_oct_common_uninit,
        .ndo_open               = cvm_oct_xaui_open,
        .ndo_stop               = cvm_oct_common_stop,
        .ndo_start_xmit         = cvm_oct_xmit,
@@ -571,7 +571,7 @@ static const struct net_device_ops cvm_oct_xaui_netdev_ops = {
 };
 static const struct net_device_ops cvm_oct_sgmii_netdev_ops = {
        .ndo_init               = cvm_oct_sgmii_init,
-       .ndo_uninit             = cvm_oct_sgmii_uninit,
+       .ndo_uninit             = cvm_oct_common_uninit,
        .ndo_open               = cvm_oct_sgmii_open,
        .ndo_stop               = cvm_oct_common_stop,
        .ndo_start_xmit         = cvm_oct_xmit,

diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
index 2581554de0b32cc547b89c6650f98127955f20fd..3ad713fb4725f17662eca96b10f091b565cde3ef 100644 (file)
--- a/drivers/staging/octeon/octeon-ethernet.h
+++ b/drivers/staging/octeon/octeon-ethernet.h
@@ -73,13 +73,11 @@ extern void cvm_oct_rgmii_uninit(struct net_device *dev);
 extern int cvm_oct_rgmii_open(struct net_device *dev);
 
 extern int cvm_oct_sgmii_init(struct net_device *dev);
-extern void cvm_oct_sgmii_uninit(struct net_device *dev);
 extern int cvm_oct_sgmii_open(struct net_device *dev);
 
 extern int cvm_oct_spi_init(struct net_device *dev);
 extern void cvm_oct_spi_uninit(struct net_device *dev);
 extern int cvm_oct_xaui_init(struct net_device *dev);
-extern void cvm_oct_xaui_uninit(struct net_device *dev);
 extern int cvm_oct_xaui_open(struct net_device *dev);
 
 extern int cvm_oct_common_init(struct net_device *dev);