Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d215697f authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

sfc: make functions static 



Make local functions and variable static. Do some rearrangement
of the string table stuff to put it where it gets used.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Acked-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0280232

drivers/net/sfc/efx.c

+3 −13
Original line number Diff line number Diff line
@@ -68,14 +68,6 @@ const char *efx_loopback_mode_names[] = { 
	[LOOPBACK_PHYXS_WS]  	= "PHYXS_WS",

};



/* Interrupt mode names (see INT_MODE())) */

const unsigned int efx_interrupt_mode_max = EFX_INT_MODE_MAX;

const char *efx_interrupt_mode_names[] = {

	[EFX_INT_MODE_MSIX]   = "MSI-X",

	[EFX_INT_MODE_MSI]    = "MSI",

	[EFX_INT_MODE_LEGACY] = "legacy",

};



const unsigned int efx_reset_type_max = RESET_TYPE_MAX;

const char *efx_reset_type_names[] = {

	[RESET_TYPE_INVISIBLE]     = "INVISIBLE",
@@ -128,7 +120,7 @@ static int napi_weight = 64; 
 * - Check the on-board hardware monitor;

 * - Poll the link state and reconfigure the hardware as necessary.

 */

unsigned int efx_monitor_interval = 1 * HZ;

static unsigned int efx_monitor_interval = 1 * HZ;



/* This controls whether or not the driver will initialise devices

 * with invalid MAC addresses stored in the EEPROM or flash.  If true,
@@ -2180,10 +2172,8 @@ int efx_port_dummy_op_int(struct efx_nic *efx) 
	return 0;

}

void efx_port_dummy_op_void(struct efx_nic *efx) {}

void efx_port_dummy_op_set_id_led(struct efx_nic *efx, enum efx_led_mode mode)

{

}

bool efx_port_dummy_op_poll(struct efx_nic *efx)



static bool efx_port_dummy_op_poll(struct efx_nic *efx)

{

	return false;

}

drivers/net/sfc/efx.h

+1 −9
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ extern int efx_reconfigure_port(struct efx_nic *efx); 
extern int __efx_reconfigure_port(struct efx_nic *efx);



/* Ethtool support */

extern int efx_ethtool_get_settings(struct net_device *net_dev,

				    struct ethtool_cmd *ecmd);

extern int efx_ethtool_set_settings(struct net_device *net_dev,

				    struct ethtool_cmd *ecmd);

extern const struct ethtool_ops efx_ethtool_ops;



/* Reset handling */
@@ -107,9 +103,7 @@ extern void efx_init_irq_moderation(struct efx_nic *efx, int tx_usecs, 
/* Dummy PHY ops for PHY drivers */

extern int efx_port_dummy_op_int(struct efx_nic *efx);

extern void efx_port_dummy_op_void(struct efx_nic *efx);

extern void

efx_port_dummy_op_set_id_led(struct efx_nic *efx, enum efx_led_mode mode);

extern bool efx_port_dummy_op_poll(struct efx_nic *efx);





/* MTD */

#ifdef CONFIG_SFC_MTD
@@ -122,8 +116,6 @@ static inline void efx_mtd_rename(struct efx_nic *efx) {} 
static inline void efx_mtd_remove(struct efx_nic *efx) {}

#endif



extern unsigned int efx_monitor_interval;



static inline void efx_schedule_channel(struct efx_channel *channel)

{

	netif_vdbg(channel->efx, intr, channel->efx->net_dev,

drivers/net/sfc/ethtool.c

+5 −5
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int efx_ethtool_phys_id(struct net_device *net_dev, u32 count) 
}



/* This must be called with rtnl_lock held. */

int efx_ethtool_get_settings(struct net_device *net_dev,

static int efx_ethtool_get_settings(struct net_device *net_dev,

				    struct ethtool_cmd *ecmd)

{

	struct efx_nic *efx = netdev_priv(net_dev);
@@ -211,7 +211,7 @@ int efx_ethtool_get_settings(struct net_device *net_dev, 
}



/* This must be called with rtnl_lock held. */

int efx_ethtool_set_settings(struct net_device *net_dev,

static int efx_ethtool_set_settings(struct net_device *net_dev,

				    struct ethtool_cmd *ecmd)

{

	struct efx_nic *efx = netdev_priv(net_dev);
@@ -891,7 +891,7 @@ static int efx_ethtool_set_wol(struct net_device *net_dev, 
	return efx->type->set_wol(efx, wol->wolopts);

}



extern int efx_ethtool_reset(struct net_device *net_dev, u32 *flags)

static int efx_ethtool_reset(struct net_device *net_dev, u32 *flags)

{

	struct efx_nic *efx = netdev_priv(net_dev);

	enum reset_type method;

drivers/net/sfc/falcon_xmac.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static bool falcon_xmac_link_ok(struct efx_nic *efx) 
		 efx_mdio_phyxgxs_lane_sync(efx));

}



void falcon_reconfigure_xmac_core(struct efx_nic *efx)

static void falcon_reconfigure_xmac_core(struct efx_nic *efx)

{

	unsigned int max_frame_len;

	efx_oword_t reg;

drivers/net/sfc/mac.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


extern struct efx_mac_operations falcon_xmac_operations;

extern struct efx_mac_operations efx_mcdi_mac_operations;

extern void falcon_reconfigure_xmac_core(struct efx_nic *efx);

extern int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr,

			      u32 dma_len, int enable, int clear);