Skip to content

Commit 45b85e4

Browse files
davem330davem330
committed
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: David S. Miller <[email protected]>
2 parents 5aa3afe + 7f8bcd9 commit 45b85e4

File tree

12 files changed

+19
-84
lines changed

12 files changed

+19
-84
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,6 @@ enum hnae_media_type {
414414
* get ring bd number limit
415415
* get_pauseparam()
416416
* get tx and rx of pause frame use
417-
* set_autoneg()
418-
* set auto autonegotiation of pause frame use
419-
* get_autoneg()
420-
* get auto autonegotiation of pause frame use
421417
* set_pauseparam()
422418
* set tx and rx of pause frame use
423419
* get_coalesce_usecs()
@@ -487,8 +483,6 @@ struct hnae_ae_ops {
487483
u32 *uplimit);
488484
void (*get_pauseparam)(struct hnae_handle *handle,
489485
u32 *auto_neg, u32 *rx_en, u32 *tx_en);
490-
int (*set_autoneg)(struct hnae_handle *handle, u8 enable);
491-
int (*get_autoneg)(struct hnae_handle *handle);
492486
int (*set_pauseparam)(struct hnae_handle *handle,
493487
u32 auto_neg, u32 rx_en, u32 tx_en);
494488
void (*get_coalesce_usecs)(struct hnae_handle *handle,

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

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -487,13 +487,6 @@ static void hns_ae_get_pauseparam(struct hnae_handle *handle,
487487
hns_dsaf_get_rx_mac_pause_en(dsaf_dev, mac_cb->mac_id, rx_en);
488488
}
489489

490-
static int hns_ae_set_autoneg(struct hnae_handle *handle, u8 enable)
491-
{
492-
assert(handle);
493-
494-
return hns_mac_set_autoneg(hns_get_mac_cb(handle), enable);
495-
}
496-
497490
static void hns_ae_set_promisc_mode(struct hnae_handle *handle, u32 en)
498491
{
499492
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)
502495
hns_mac_set_promisc(mac_cb, (u8)!!en);
503496
}
504497

505-
static int hns_ae_get_autoneg(struct hnae_handle *handle)
506-
{
507-
u32 auto_neg;
508-
509-
assert(handle);
510-
511-
hns_mac_get_autoneg(hns_get_mac_cb(handle), &auto_neg);
512-
513-
return auto_neg;
514-
}
515-
516498
static int hns_ae_set_pauseparam(struct hnae_handle *handle,
517499
u32 autoneg, u32 rx_en, u32 tx_en)
518500
{
@@ -648,7 +630,7 @@ static void hns_ae_update_stats(struct hnae_handle *handle,
648630
struct hnae_vf_cb *vf_cb = hns_ae_get_vf_cb(handle);
649631
u64 tx_bytes = 0, rx_bytes = 0, tx_packets = 0, rx_packets = 0;
650632
u64 rx_errors = 0, tx_errors = 0, tx_dropped = 0;
651-
u64 rx_missed_errors = 0;
633+
u64 rx_missed_errors;
652634

653635
dsaf_dev = hns_ae_get_dsaf_dev(handle->dev);
654636
if (!dsaf_dev)
@@ -965,8 +947,6 @@ static struct hnae_ae_ops hns_dsaf_ops = {
965947
.set_loopback = hns_ae_config_loopback,
966948
.get_ring_bdnum_limit = hns_ae_get_ring_bdnum_limit,
967949
.get_pauseparam = hns_ae_get_pauseparam,
968-
.set_autoneg = hns_ae_set_autoneg,
969-
.get_autoneg = hns_ae_get_autoneg,
970950
.set_pauseparam = hns_ae_set_pauseparam,
971951
.get_coalesce_usecs = hns_ae_get_coalesce_usecs,
972952
.get_max_coalesced_frames = hns_ae_get_max_coalesced_frames,

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,6 @@ static void hns_gmac_get_tx_auto_pause_frames(void *mac_drv, u16 *newval)
130130
GMAC_FC_TX_TIMER_M, GMAC_FC_TX_TIMER_S);
131131
}
132132

133-
static void hns_gmac_set_rx_auto_pause_frames(void *mac_drv, u32 newval)
134-
{
135-
struct mac_driver *drv = (struct mac_driver *)mac_drv;
136-
137-
dsaf_set_dev_bit(drv, GMAC_PAUSE_EN_REG,
138-
GMAC_PAUSE_EN_RX_FDFC_B, !!newval);
139-
}
140-
141133
static void hns_gmac_config_max_frame_length(void *mac_drv, u16 newval)
142134
{
143135
struct mac_driver *drv = (struct mac_driver *)mac_drv;
@@ -179,14 +171,6 @@ static void hns_gmac_tx_loop_pkt_dis(void *mac_drv)
179171
dsaf_write_dev(drv, GMAC_TX_LOOP_PKT_PRI_REG, tx_loop_pkt_pri);
180172
}
181173

182-
static void hns_gmac_set_duplex_type(void *mac_drv, u8 newval)
183-
{
184-
struct mac_driver *drv = (struct mac_driver *)mac_drv;
185-
186-
dsaf_set_dev_bit(drv, GMAC_DUPLEX_TYPE_REG,
187-
GMAC_DUPLEX_TYPE_B, !!newval);
188-
}
189-
190174
static void hns_gmac_get_duplex_type(void *mac_drv,
191175
enum hns_gmac_duplex_mdoe *duplex_mode)
192176
{
@@ -738,8 +722,6 @@ void *hns_gmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param)
738722
mac_drv->set_an_mode = hns_gmac_config_an_mode;
739723
mac_drv->config_loopback = hns_gmac_config_loopback;
740724
mac_drv->config_pad_and_crc = hns_gmac_config_pad_and_crc;
741-
mac_drv->config_half_duplex = hns_gmac_set_duplex_type;
742-
mac_drv->set_rx_ignore_pause_frames = hns_gmac_set_rx_auto_pause_frames;
743725
mac_drv->get_info = hns_gmac_get_info;
744726
mac_drv->autoneg_stat = hns_gmac_autoneg_stat;
745727
mac_drv->get_pause_enable = hns_gmac_get_pausefrm_cfg;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ void hns_mac_get_regs(struct hns_mac_cb *mac_cb, void *data)
12021202

12031203
void hns_set_led_opt(struct hns_mac_cb *mac_cb)
12041204
{
1205-
int nic_data = 0;
1205+
int nic_data;
12061206
int txpkts, rxpkts;
12071207

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,8 @@ struct mac_driver {
364364
void (*config_max_frame_length)(void *mac_drv, u16 newval);
365365
/*config PAD and CRC enable */
366366
void (*config_pad_and_crc)(void *mac_drv, u8 newval);
367-
/* config duplex mode*/
368-
void (*config_half_duplex)(void *mac_drv, u8 newval);
369367
/*config tx pause time,if pause_time is zero,disable tx pause enable*/
370368
void (*set_tx_auto_pause_frames)(void *mac_drv, u16 pause_time);
371-
/*config rx pause enable*/
372-
void (*set_rx_ignore_pause_frames)(void *mac_drv, u32 enable);
373369
/* config rx mode for promiscuous*/
374370
void (*set_promiscuous)(void *mac_drv, u8 enable);
375371
void (*mac_pausefrm_cfg)(void *mac_drv, u32 rx_en, u32 tx_en);

‎drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,7 +1613,7 @@ int hns_dsaf_set_mac_uc_entry(
16131613
struct dsaf_device *dsaf_dev,
16141614
struct dsaf_drv_mac_single_dest_entry *mac_entry)
16151615
{
1616-
u16 entry_index = DSAF_INVALID_ENTRY_IDX;
1616+
u16 entry_index;
16171617
struct dsaf_drv_tbl_tcam_key mac_key;
16181618
struct dsaf_tbl_tcam_ucast_cfg mac_data;
16191619
struct dsaf_drv_priv *priv =
@@ -1679,7 +1679,7 @@ int hns_dsaf_rm_mac_addr(
16791679
struct dsaf_device *dsaf_dev,
16801680
struct dsaf_drv_mac_single_dest_entry *mac_entry)
16811681
{
1682-
u16 entry_index = DSAF_INVALID_ENTRY_IDX;
1682+
u16 entry_index;
16831683
struct dsaf_tbl_tcam_ucast_cfg mac_data;
16841684
struct dsaf_drv_tbl_tcam_key mac_key;
16851685

@@ -1751,7 +1751,7 @@ static void hns_dsaf_mc_mask_bit_clear(char *dst, const char *src)
17511751
int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
17521752
struct dsaf_drv_mac_single_dest_entry *mac_entry)
17531753
{
1754-
u16 entry_index = DSAF_INVALID_ENTRY_IDX;
1754+
u16 entry_index;
17551755
struct dsaf_drv_tbl_tcam_key mac_key;
17561756
struct dsaf_drv_tbl_tcam_key mask_key;
17571757
struct dsaf_tbl_tcam_data *pmask_key = NULL;
@@ -1861,7 +1861,7 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
18611861
int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id,
18621862
u8 in_port_num, u8 *addr)
18631863
{
1864-
u16 entry_index = DSAF_INVALID_ENTRY_IDX;
1864+
u16 entry_index;
18651865
struct dsaf_drv_tbl_tcam_key mac_key;
18661866
struct dsaf_drv_priv *priv =
18671867
(struct dsaf_drv_priv *)hns_dsaf_dev_priv(dsaf_dev);
@@ -1910,7 +1910,7 @@ int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id,
19101910
int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,
19111911
struct dsaf_drv_mac_single_dest_entry *mac_entry)
19121912
{
1913-
u16 entry_index = DSAF_INVALID_ENTRY_IDX;
1913+
u16 entry_index;
19141914
struct dsaf_drv_tbl_tcam_key mac_key;
19151915
struct dsaf_drv_priv *priv = hns_dsaf_dev_priv(dsaf_dev);
19161916
struct dsaf_drv_soft_mac_tbl *soft_mac_entry = priv->soft_mac_tbl;
@@ -2264,7 +2264,7 @@ void hns_dsaf_update_stats(struct dsaf_device *dsaf_dev, u32 node_num)
22642264
*/
22652265
void hns_dsaf_get_regs(struct dsaf_device *ddev, u32 port, void *data)
22662266
{
2267-
u32 i = 0;
2267+
u32 i;
22682268
u32 j;
22692269
u32 *p = data;
22702270
u32 reg_tmp;
@@ -2768,7 +2768,7 @@ static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port)
27682768
struct dsaf_drv_mac_single_dest_entry mask_entry;
27692769
struct dsaf_drv_tbl_tcam_key temp_key, mask_key;
27702770
struct dsaf_drv_soft_mac_tbl *soft_mac_entry;
2771-
u16 entry_index = DSAF_INVALID_ENTRY_IDX;
2771+
u16 entry_index;
27722772
struct dsaf_drv_tbl_tcam_key mac_key;
27732773
struct hns_mac_cb *mac_cb;
27742774
u8 addr[ETH_ALEN] = {0};
@@ -2870,7 +2870,7 @@ static void set_promisc_tcam_disable(struct dsaf_device *dsaf_dev, u32 port)
28702870
struct dsaf_tbl_tcam_data tbl_tcam_data_uc = {0, 0};
28712871
struct dsaf_tbl_tcam_data tbl_tcam_mask = {0, 0};
28722872
struct dsaf_drv_soft_mac_tbl *soft_mac_entry;
2873-
u16 entry_index = DSAF_INVALID_ENTRY_IDX;
2873+
u16 entry_index;
28742874
struct dsaf_drv_tbl_tcam_key mac_key;
28752875
u8 addr[ETH_ALEN] = {0};
28762876

‎drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ hns_mac_config_sds_loopback_acpi(struct hns_mac_cb *mac_cb, bool en)
686686
obj_args[0].integer.type = ACPI_TYPE_INTEGER;
687687
obj_args[0].integer.value = mac_cb->mac_id;
688688
obj_args[1].integer.type = ACPI_TYPE_INTEGER;
689-
obj_args[1].integer.value = !!en;
689+
obj_args[1].integer.value = en;
690690

691691
argv4.type = ACPI_TYPE_PACKAGE;
692692
argv4.package.count = 2;

‎drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ void hns_rcb_get_common_regs(struct rcb_common_cb *rcb_com, void *data)
974974
bool is_dbg = HNS_DSAF_IS_DEBUG(rcb_com->dsaf_dev);
975975
u32 reg_tmp;
976976
u32 reg_num_tmp;
977-
u32 i = 0;
977+
u32 i;
978978

979979
/*rcb common registers */
980980
regs[0] = dsaf_read_dev(rcb_com, RCB_COM_CFG_ENDIAN_REG);
@@ -1045,7 +1045,7 @@ void hns_rcb_get_ring_regs(struct hnae_queue *queue, void *data)
10451045
u32 *regs = data;
10461046
struct ring_pair_cb *ring_pair
10471047
= container_of(queue, struct ring_pair_cb, q);
1048-
u32 i = 0;
1048+
u32 i;
10491049

10501050
/*rcb ring registers */
10511051
regs[0] = dsaf_read_dev(queue, RCB_RING_RX_RING_BASEADDR_L_REG);

‎drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -266,19 +266,6 @@ static void hns_xgmac_set_pausefrm_mac_addr(void *mac_drv, char *mac_addr)
266266
dsaf_write_dev(drv, XGMAC_MAC_PAUSE_LOCAL_MAC_H_REG, high_val);
267267
}
268268

269-
/**
270-
*hns_xgmac_set_rx_ignore_pause_frames - set rx pause param about xgmac
271-
*@mac_drv: mac driver
272-
*@enable:enable rx pause param
273-
*/
274-
static void hns_xgmac_set_rx_ignore_pause_frames(void *mac_drv, u32 enable)
275-
{
276-
struct mac_driver *drv = (struct mac_driver *)mac_drv;
277-
278-
dsaf_set_dev_bit(drv, XGMAC_MAC_PAUSE_CTRL_REG,
279-
XGMAC_PAUSE_CTL_RX_B, !!enable);
280-
}
281-
282269
/**
283270
*hns_xgmac_set_tx_auto_pause_frames - set tx pause param about xgmac
284271
*@mac_drv: mac driver
@@ -495,7 +482,7 @@ static void hns_xgmac_get_link_status(void *mac_drv, u32 *link_stat)
495482
*/
496483
static void hns_xgmac_get_regs(void *mac_drv, void *data)
497484
{
498-
u32 i = 0;
485+
u32 i;
499486
struct mac_driver *drv = (struct mac_driver *)mac_drv;
500487
u32 *regs = data;
501488
u64 qtmp;
@@ -812,9 +799,6 @@ void *hns_xgmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param)
812799
mac_drv->set_an_mode = NULL;
813800
mac_drv->config_loopback = NULL;
814801
mac_drv->config_pad_and_crc = hns_xgmac_config_pad_and_crc;
815-
mac_drv->config_half_duplex = NULL;
816-
mac_drv->set_rx_ignore_pause_frames =
817-
hns_xgmac_set_rx_ignore_pause_frames;
818802
mac_drv->mac_free = hns_xgmac_free;
819803
mac_drv->adjust_link = NULL;
820804
mac_drv->set_tx_auto_pause_frames = hns_xgmac_set_tx_auto_pause_frames;

‎drivers/net/ethernet/hisilicon/hns/hns_enet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ static int hns_nic_rx_poll_one(struct hns_nic_ring_data *ring_data,
872872
static bool hns_nic_rx_fini_pro(struct hns_nic_ring_data *ring_data)
873873
{
874874
struct hnae_ring *ring = ring_data->ring;
875-
int num = 0;
875+
int num;
876876
bool rx_stopped;
877877

878878
hns_update_rx_rate(ring);
@@ -1881,7 +1881,7 @@ static void hns_nic_set_rx_mode(struct net_device *ndev)
18811881
static void hns_nic_get_stats64(struct net_device *ndev,
18821882
struct rtnl_link_stats64 *stats)
18831883
{
1884-
int idx = 0;
1884+
int idx;
18851885
u64 tx_bytes = 0;
18861886
u64 rx_bytes = 0;
18871887
u64 tx_pkts = 0;

‎drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#define HNS_PHY_CSC_REG 16 /* Copper Specific Control Register */
1818
#define HNS_PHY_CSS_REG 17 /* Copper Specific Status Register */
1919
#define HNS_LED_FC_REG 16 /* LED Function Control Reg. */
20-
#define HNS_LED_PC_REG 17 /* LED Polarity Control Reg. */
2120

2221
#define HNS_LED_FORCE_ON 9
2322
#define HNS_LED_FORCE_OFF 8
@@ -480,7 +479,7 @@ static int __lb_run_test(struct net_device *ndev,
480479
#define NIC_LB_TEST_NO_MEM_ERR 1
481480
#define NIC_LB_TEST_TX_CNT_ERR 2
482481
#define NIC_LB_TEST_RX_CNT_ERR 3
483-
#define NIC_LB_TEST_RX_PKG_ERR 4
482+
484483
struct hns_nic_priv *priv = netdev_priv(ndev);
485484
struct hnae_handle *h = priv->ae_handle;
486485
int i, j, lc, good_cnt, ret_val = 0;

‎drivers/net/ethernet/hisilicon/hns_mdio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ static int hns_mdio_write(struct mii_bus *bus,
279279
static int hns_mdio_read(struct mii_bus *bus, int phy_id, int regnum)
280280
{
281281
int ret;
282-
u16 reg_val = 0;
282+
u16 reg_val;
283283
u8 devad = ((regnum >> 16) & 0x1f);
284284
u8 is_c45 = !!(regnum & MII_ADDR_C45);
285285
u16 reg = (u16)(regnum & 0xffff);
@@ -420,7 +420,7 @@ static int hns_mdio_probe(struct platform_device *pdev)
420420
{
421421
struct hns_mdio_device *mdio_dev;
422422
struct mii_bus *new_bus;
423-
int ret = -ENODEV;
423+
int ret;
424424

425425
if (!pdev) {
426426
dev_err(NULL, "pdev is NULL!\r\n");

0 commit comments

Comments
 (0)