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

Commit b4957ab0 authored by Salil's avatar Salil Committed by David S. Miller
Browse files

net: hns: Some checkpatch.pl script & warning fixes 



This patch fixes some checkpatch.pl script caught errors and
warnings during the compilation time.

Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 820c90cb

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

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ enum hnae_led_state { 
#define HNS_RX_FLAG_L4ID_TCP 0x1

#define HNS_RX_FLAG_L4ID_SCTP 0x3





#define HNS_TXD_ASID_S 0

#define HNS_TXD_ASID_M (0xff << HNS_TXD_ASID_S)

#define HNS_TXD_BUFNUM_S 8

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

+5 −6
Original line number Diff line number Diff line
@@ -86,8 +86,7 @@ static void hns_gmac_disable(void *mac_drv, enum mac_commom_mode mode) 
		dsaf_set_dev_bit(drv, GMAC_PORT_EN_REG, GMAC_PORT_RX_EN_B, 0);

}



/**

*hns_gmac_get_en - get port enable

/* hns_gmac_get_en - get port enable

 * @mac_drv:mac device

 * @rx:rx enable

 * @tx:tx enable

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ enum dsaf_roce_qos_sl { 
};



#define DSAF_STATS_READ(p, offset) (*((u64 *)((u8 *)(p) + (offset))))

#define HNS_DSAF_IS_DEBUG(dev) (dev->dsaf_mode == DSAF_MODE_DISABLE_SP)

#define HNS_DSAF_IS_DEBUG(dev) ((dev)->dsaf_mode == DSAF_MODE_DISABLE_SP)



enum hal_dsaf_mode {

	HRD_DSAF_NO_DSAF_MODE	= 0x0,

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

+0 −1
Original line number Diff line number Diff line
@@ -471,7 +471,6 @@ static void hns_rcb_ring_pair_get_cfg(struct ring_pair_cb *ring_pair_cb) 
static int hns_rcb_get_port_in_comm(

	struct rcb_common_cb *rcb_common, int ring_idx)

{



	return ring_idx / (rcb_common->max_q_per_vf * rcb_common->max_vfn);

}

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

+5 −4
Original line number Diff line number Diff line
@@ -512,7 +512,8 @@ static void hns_nic_reuse_page(struct sk_buff *skb, int i, 
	int last_offset;

	bool twobufs;



	twobufs = ((PAGE_SIZE < 8192) && hnae_buf_size(ring) == HNS_BUFFER_SIZE_2048);

	twobufs = ((PAGE_SIZE < 8192) &&

		hnae_buf_size(ring) == HNS_BUFFER_SIZE_2048);



	desc = &ring->desc[ring->next_to_clean];

	size = le16_to_cpu(desc->rx.size);
@@ -922,8 +923,8 @@ static int is_valid_clean_head(struct hnae_ring *ring, int h) 


/* netif_tx_lock will turn down the performance, set only when necessary */

#ifdef CONFIG_NET_POLL_CONTROLLER

#define NETIF_TX_LOCK(ring) spin_lock(&ring->lock)

#define NETIF_TX_UNLOCK(ring) spin_unlock(&ring->lock)

#define NETIF_TX_LOCK(ring) spin_lock(&(ring)->lock)

#define NETIF_TX_UNLOCK(ring) spin_unlock(&(ring)->lock)

#else

#define NETIF_TX_LOCK(ring)

#define NETIF_TX_UNLOCK(ring)
@@ -2012,7 +2013,7 @@ static void hns_nic_reset_subtask(struct hns_nic_priv *priv) 
static void hns_nic_service_event_complete(struct hns_nic_priv *priv)

{

	WARN_ON(!test_bit(NIC_STATE_SERVICE_SCHED, &priv->state));



	/* make sure to commit the things */

	smp_mb__before_atomic();

	clear_bit(NIC_STATE_SERVICE_SCHED, &priv->state);

}