Commit 45b85e47 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns-cleanups' 



Huazhong Tan says:

====================
net: hns: add some cleanups

This series includes some cleanups for the HNS ethernet driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5aa3afe1 7f8bcd91

drivers/net/ethernet/hisilicon/hns/hnae.h

+0 −6
Original line number Diff line number Diff line
@@ -414,10 +414,6 @@ enum hnae_media_type { 
 *   get ring bd number limit

 * get_pauseparam()

 *   get tx and rx of pause frame use

 * set_autoneg()

 *   set auto autonegotiation of pause frame use

 * get_autoneg()

 *   get auto autonegotiation of pause frame use

 * set_pauseparam()

 *   set tx and rx of pause frame use

 * get_coalesce_usecs()
@@ -487,8 +483,6 @@ struct hnae_ae_ops { 
				     u32 *uplimit);

	void (*get_pauseparam)(struct hnae_handle *handle,

			       u32 *auto_neg, u32 *rx_en, u32 *tx_en);

	int (*set_autoneg)(struct hnae_handle *handle, u8 enable);

	int (*get_autoneg)(struct hnae_handle *handle);

	int (*set_pauseparam)(struct hnae_handle *handle,

			      u32 auto_neg, u32 rx_en, u32 tx_en);

	void (*get_coalesce_usecs)(struct hnae_handle *handle,

drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c

+1 −21
Original line number Diff line number Diff line
@@ -487,13 +487,6 @@ static void hns_ae_get_pauseparam(struct hnae_handle *handle, 
		hns_dsaf_get_rx_mac_pause_en(dsaf_dev, mac_cb->mac_id, rx_en);

}



static int hns_ae_set_autoneg(struct hnae_handle *handle, u8 enable)

{

	assert(handle);



	return hns_mac_set_autoneg(hns_get_mac_cb(handle), enable);

}



static void hns_ae_set_promisc_mode(struct hnae_handle *handle, u32 en)

{

	struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);
@@ -502,17 +495,6 @@ static void hns_ae_set_promisc_mode(struct hnae_handle *handle, u32 en) 
	hns_mac_set_promisc(mac_cb, (u8)!!en);

}



static int hns_ae_get_autoneg(struct hnae_handle *handle)

{

	u32     auto_neg;



	assert(handle);



	hns_mac_get_autoneg(hns_get_mac_cb(handle), &auto_neg);



	return auto_neg;

}



static int hns_ae_set_pauseparam(struct hnae_handle *handle,

				 u32 autoneg, u32 rx_en, u32 tx_en)

{
@@ -648,7 +630,7 @@ static void hns_ae_update_stats(struct hnae_handle *handle, 
	struct hnae_vf_cb *vf_cb = hns_ae_get_vf_cb(handle);

	u64 tx_bytes = 0, rx_bytes = 0, tx_packets = 0, rx_packets = 0;

	u64 rx_errors = 0, tx_errors = 0, tx_dropped = 0;

	u64 rx_missed_errors = 0;

	u64 rx_missed_errors;



	dsaf_dev = hns_ae_get_dsaf_dev(handle->dev);

	if (!dsaf_dev)
@@ -965,8 +947,6 @@ static struct hnae_ae_ops hns_dsaf_ops = { 
	.set_loopback = hns_ae_config_loopback,

	.get_ring_bdnum_limit = hns_ae_get_ring_bdnum_limit,

	.get_pauseparam = hns_ae_get_pauseparam,

	.set_autoneg = hns_ae_set_autoneg,

	.get_autoneg = hns_ae_get_autoneg,

	.set_pauseparam = hns_ae_set_pauseparam,

	.get_coalesce_usecs = hns_ae_get_coalesce_usecs,

	.get_max_coalesced_frames = hns_ae_get_max_coalesced_frames,

drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c

+0 −18
Original line number Diff line number Diff line
@@ -130,14 +130,6 @@ static void hns_gmac_get_tx_auto_pause_frames(void *mac_drv, u16 *newval) 
				     GMAC_FC_TX_TIMER_M, GMAC_FC_TX_TIMER_S);

}



static void hns_gmac_set_rx_auto_pause_frames(void *mac_drv, u32 newval)

{

	struct mac_driver *drv = (struct mac_driver *)mac_drv;



	dsaf_set_dev_bit(drv, GMAC_PAUSE_EN_REG,

			 GMAC_PAUSE_EN_RX_FDFC_B, !!newval);

}



static void hns_gmac_config_max_frame_length(void *mac_drv, u16 newval)

{

	struct mac_driver *drv = (struct mac_driver *)mac_drv;
@@ -179,14 +171,6 @@ static void hns_gmac_tx_loop_pkt_dis(void *mac_drv) 
	dsaf_write_dev(drv, GMAC_TX_LOOP_PKT_PRI_REG, tx_loop_pkt_pri);

}



static void hns_gmac_set_duplex_type(void *mac_drv, u8 newval)

{

	struct mac_driver *drv = (struct mac_driver *)mac_drv;



	dsaf_set_dev_bit(drv, GMAC_DUPLEX_TYPE_REG,

			 GMAC_DUPLEX_TYPE_B, !!newval);

}



static void hns_gmac_get_duplex_type(void *mac_drv,

				     enum hns_gmac_duplex_mdoe *duplex_mode)

{
@@ -738,8 +722,6 @@ void *hns_gmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param) 
	mac_drv->set_an_mode = hns_gmac_config_an_mode;

	mac_drv->config_loopback = hns_gmac_config_loopback;

	mac_drv->config_pad_and_crc = hns_gmac_config_pad_and_crc;

	mac_drv->config_half_duplex = hns_gmac_set_duplex_type;

	mac_drv->set_rx_ignore_pause_frames = hns_gmac_set_rx_auto_pause_frames;

	mac_drv->get_info = hns_gmac_get_info;

	mac_drv->autoneg_stat = hns_gmac_autoneg_stat;

	mac_drv->get_pause_enable = hns_gmac_get_pausefrm_cfg;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ void hns_mac_get_regs(struct hns_mac_cb *mac_cb, void *data) 


void hns_set_led_opt(struct hns_mac_cb *mac_cb)

{

	int nic_data = 0;

	int nic_data;

	int txpkts, rxpkts;



	txpkts = mac_cb->txpkt_for_led - mac_cb->hw_stats.tx_good_pkts;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h

+0 −4
Original line number Diff line number Diff line
@@ -364,12 +364,8 @@ struct mac_driver { 
	void (*config_max_frame_length)(void *mac_drv, u16 newval);

	/*config PAD and CRC enable */

	void (*config_pad_and_crc)(void *mac_drv, u8 newval);

	/* config duplex mode*/

	void (*config_half_duplex)(void *mac_drv, u8 newval);

	/*config tx pause time,if pause_time is zero,disable tx pause enable*/

	void (*set_tx_auto_pause_frames)(void *mac_drv, u16 pause_time);

	/*config rx pause enable*/

	void (*set_rx_ignore_pause_frames)(void *mac_drv, u32 enable);

	/* config rx mode for promiscuous*/

	void (*set_promiscuous)(void *mac_drv, u8 enable);

	void (*mac_pausefrm_cfg)(void *mac_drv, u32 rx_en, u32 tx_en);