[PATCH 04/20] staging: octeon-ethernet: delete sgmii and xaui specific uninit functions

[Aaro Koskinen]

Delete redundant wrappers.

Signed-off-by: Aaro Koskinen <aaro.koski...@iki.fi>
---
 drivers/staging/octeon/ethernet-sgmii.c  | 5 -----
 drivers/staging/octeon/ethernet-xaui.c   | 5 -----
 drivers/staging/octeon/ethernet.c        | 4 ++--
 drivers/staging/octeon/octeon-ethernet.h | 2 --
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/octeon/ethernet-sgmii.c 
b/drivers/staging/octeon/ethernet-sgmii.c
index cd791c3..1158eac 100644
--- 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 5782c38..3714fae 100644
--- 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 49c01f2..44fc2a4 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -546,7 +546,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,
@@ -561,7 +561,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 2581554..3ad713f 100644
--- 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);
-- 
2.3.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel