Commit 3c339145 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

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



Delete redundant wrappers.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be76400c

drivers/staging/octeon/ethernet-sgmii.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

}

drivers/staging/octeon/ethernet-xaui.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

}

drivers/staging/octeon/ethernet.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/staging/octeon/octeon-ethernet.h

+0 −2
Original line number Diff line number Diff line
@@ -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);