net: hns3: remove some ops in struct hns3_nic_ops

The fill_desc ops has only one implementation, and
get_rxd_bnum has not been used, so this patch removes
them.

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index a84060fd0464cd60a116822fa9540ee908f7f957..33ac732a9e2809ccac445663372ebbea2bfdac17 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1279,8 +1279,8 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        next_to_use_head = ring->next_to_use;
 
-       ret = priv->ops.fill_desc(ring, skb, size, seg_num == 1 ? 1 : 0,
-                                 DESC_TYPE_SKB);
+       ret = hns3_fill_desc(ring, skb, size, seg_num == 1 ? 1 : 0,
+                            DESC_TYPE_SKB);
        if (ret)
                goto head_fill_err;
 
@@ -1290,9 +1290,9 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
                frag = &skb_shinfo(skb)->frags[i - 1];
                size = skb_frag_size(frag);
 
-               ret = priv->ops.fill_desc(ring, frag, size,
-                                         seg_num - 1 == i ? 1 : 0,
-                                         DESC_TYPE_PAGE);
+               ret = hns3_fill_desc(ring, frag, size,
+                                    seg_num - 1 == i ? 1 : 0,
+                                    DESC_TYPE_PAGE);
 
                if (ret)
                        goto frag_fill_err;
@@ -3579,7 +3579,6 @@ static void hns3_nic_set_priv_ops(struct net_device *netdev)
 {
        struct hns3_nic_priv *priv = netdev_priv(netdev);
 
-       priv->ops.fill_desc = hns3_fill_desc;
        if ((netdev->features & NETIF_F_TSO) ||
            (netdev->features & NETIF_F_TSO6))
                priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tso;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index 5c414653d0b635b5904f6518a28cb9a8d3d1893f..3a1e4879b2f80ce1860bd45b241de7c18119b53b 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -444,11 +444,8 @@ struct hns3_nic_ring_data {
 };
 
 struct hns3_nic_ops {
-       int (*fill_desc)(struct hns3_enet_ring *ring, void *priv,
-                        int size, int frag_end, enum hns_desc_type type);
        int (*maybe_stop_tx)(struct sk_buff **out_skb,
                             int *bnum, struct hns3_enet_ring *ring);
-       void (*get_rxd_bnum)(u32 bnum_flag, int *out_bnum);
 };
 
 enum hns3_flow_level_range {