Commit 96217ebf authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-ethernet: consolidate ndo_stop functions 



All ndo_stop functions are identical. Get rid of duplicated code.

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

drivers/staging/octeon/ethernet-mdio.c

+8 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include "ethernet-util.h"



#include <asm/octeon/cvmx-helper-board.h>



#include <asm/octeon/cvmx-gmxx-defs.h>

#include <asm/octeon/cvmx-smix-defs.h>



static void cvm_oct_get_drvinfo(struct net_device *dev,
@@ -150,7 +150,14 @@ void cvm_oct_adjust_link(struct net_device *dev) 
int cvm_oct_common_stop(struct net_device *dev)

{

	struct octeon_ethernet *priv = netdev_priv(dev);

	int interface = INTERFACE(priv->port);

	cvmx_helper_link_info_t link_info;

	union cvmx_gmxx_prtx_cfg gmx_cfg;

	int index = INDEX(priv->port);



	gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface));

	gmx_cfg.s.en = 0;

	cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);



	priv->poll = NULL;

drivers/staging/octeon/ethernet-rgmii.c

+0 −13
Original line number Diff line number Diff line
@@ -301,19 +301,6 @@ int cvm_oct_rgmii_open(struct net_device *dev) 
	return cvm_oct_common_open(dev, cvm_oct_rgmii_poll, false);

}



int cvm_oct_rgmii_stop(struct net_device *dev)

{

	union cvmx_gmxx_prtx_cfg gmx_cfg;

	struct octeon_ethernet *priv = netdev_priv(dev);

	int interface = INTERFACE(priv->port);

	int index = INDEX(priv->port);



	gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface));

	gmx_cfg.s.en = 0;

	cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);

	return cvm_oct_common_stop(dev);

}



static void cvm_oct_rgmii_immediate_poll(struct work_struct *work)

{

	struct octeon_ethernet *priv =

drivers/staging/octeon/ethernet-sgmii.c

+0 −13
Original line number Diff line number Diff line
@@ -82,19 +82,6 @@ int cvm_oct_sgmii_open(struct net_device *dev) 
	return cvm_oct_common_open(dev, cvm_oct_sgmii_poll, true);

}



int cvm_oct_sgmii_stop(struct net_device *dev)

{

	union cvmx_gmxx_prtx_cfg gmx_cfg;

	struct octeon_ethernet *priv = netdev_priv(dev);

	int interface = INTERFACE(priv->port);

	int index = INDEX(priv->port);



	gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface));

	gmx_cfg.s.en = 0;

	cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);

	return cvm_oct_common_stop(dev);

}



int cvm_oct_sgmii_init(struct net_device *dev)

{

	cvm_oct_common_init(dev);

drivers/staging/octeon/ethernet-xaui.c

+0 −13
Original line number Diff line number Diff line
@@ -82,19 +82,6 @@ int cvm_oct_xaui_open(struct net_device *dev) 
	return cvm_oct_common_open(dev, cvm_oct_xaui_poll, true);

}



int cvm_oct_xaui_stop(struct net_device *dev)

{

	union cvmx_gmxx_prtx_cfg gmx_cfg;

	struct octeon_ethernet *priv = netdev_priv(dev);

	int interface = INTERFACE(priv->port);

	int index = INDEX(priv->port);



	gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface));

	gmx_cfg.s.en = 0;

	cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);

	return cvm_oct_common_stop(dev);

}



int cvm_oct_xaui_init(struct net_device *dev)

{

	struct octeon_ethernet *priv = netdev_priv(dev);

drivers/staging/octeon/ethernet.c

+3 −3
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static const struct net_device_ops cvm_oct_xaui_netdev_ops = { 
	.ndo_init		= cvm_oct_xaui_init,

	.ndo_uninit		= cvm_oct_xaui_uninit,

	.ndo_open		= cvm_oct_xaui_open,

	.ndo_stop		= cvm_oct_xaui_stop,

	.ndo_stop		= cvm_oct_common_stop,

	.ndo_start_xmit		= cvm_oct_xmit,

	.ndo_set_rx_mode	= cvm_oct_common_set_multicast_list,

	.ndo_set_mac_address	= cvm_oct_common_set_mac_address,
@@ -570,7 +570,7 @@ static const struct net_device_ops cvm_oct_sgmii_netdev_ops = { 
	.ndo_init		= cvm_oct_sgmii_init,

	.ndo_uninit		= cvm_oct_sgmii_uninit,

	.ndo_open		= cvm_oct_sgmii_open,

	.ndo_stop		= cvm_oct_sgmii_stop,

	.ndo_stop		= cvm_oct_common_stop,

	.ndo_start_xmit		= cvm_oct_xmit,

	.ndo_set_rx_mode	= cvm_oct_common_set_multicast_list,

	.ndo_set_mac_address	= cvm_oct_common_set_mac_address,
@@ -598,7 +598,7 @@ static const struct net_device_ops cvm_oct_rgmii_netdev_ops = { 
	.ndo_init		= cvm_oct_rgmii_init,

	.ndo_uninit		= cvm_oct_rgmii_uninit,

	.ndo_open		= cvm_oct_rgmii_open,

	.ndo_stop		= cvm_oct_rgmii_stop,

	.ndo_stop		= cvm_oct_common_stop,

	.ndo_start_xmit		= cvm_oct_xmit,

	.ndo_set_rx_mode	= cvm_oct_common_set_multicast_list,

	.ndo_set_mac_address	= cvm_oct_common_set_mac_address,