Commit 64749c9c authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: remove redundant return value of hns3_uninit_all_ring() 



Since hns3_uninit_all_ring() only returns 0, so remove this
redundant return value and function declaration in hns3_enet.h.

Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cad8dfe8

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+3 −9
Original line number Diff line number Diff line
@@ -4084,7 +4084,7 @@ int hns3_init_all_ring(struct hns3_nic_priv *priv) 
	return -ENOMEM;

}



int hns3_uninit_all_ring(struct hns3_nic_priv *priv)

static void hns3_uninit_all_ring(struct hns3_nic_priv *priv)

{

	struct hnae3_handle *h = priv->ae_handle;

	int i;
@@ -4093,7 +4093,6 @@ int hns3_uninit_all_ring(struct hns3_nic_priv *priv) 
		hns3_fini_ring(&priv->ring[i]);

		hns3_fini_ring(&priv->ring[i + h->kinfo.num_tqps]);

	}

	return 0;

}



/* Set mac addr if it is configured. or leave it to the AE driver */
@@ -4321,7 +4320,6 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset) 
{

	struct net_device *netdev = handle->kinfo.netdev;

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	int ret;



	if (netdev->reg_state != NETREG_UNINITIALIZED)

		unregister_netdev(netdev);
@@ -4347,9 +4345,7 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset) 


	hns3_nic_dealloc_vector_data(priv);



	ret = hns3_uninit_all_ring(priv);

	if (ret)

		netdev_err(netdev, "uninit ring error\n");

	hns3_uninit_all_ring(priv);



	hns3_put_ring_config(priv);
@@ -4662,9 +4658,7 @@ static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle) 


	hns3_nic_dealloc_vector_data(priv);



	ret = hns3_uninit_all_ring(priv);

	if (ret)

		netdev_err(netdev, "uninit ring error\n");

	hns3_uninit_all_ring(priv);



	hns3_put_ring_config(priv);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+0 −1
Original line number Diff line number Diff line
@@ -605,7 +605,6 @@ int hns3_set_channels(struct net_device *netdev, 


void hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget);

int hns3_init_all_ring(struct hns3_nic_priv *priv);

int hns3_uninit_all_ring(struct hns3_nic_priv *priv);

int hns3_nic_reset_all_ring(struct hnae3_handle *h);

void hns3_fini_ring(struct hns3_enet_ring *ring);

netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev);