Revert "UBUNTU: SAUCE: {topost} net: hns3: rename the interface for init_client_insta...

BugLink: https://bugs.launchpad.net/bugs/1787477
This reverts commit e7e09222c1fe15917fae14494abcd69eacf0591b.
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index b2a40070123e5d32fd64b1356c2657bdaf2228f6..c77b09f04bc392ee2bdba0cc00cde4fe32d44655 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -1599,10 +1599,9 @@ static void hclgevf_misc_irq_uninit(struct hclgevf_dev *hdev)
        hclgevf_free_vector(hdev, 0);
 }
 
-static int hclgevf_init_client_instance(struct hnae3_client *client,
-                                       struct hnae3_ae_dev *ae_dev)
+static int hclgevf_init_instance(struct hclgevf_dev *hdev,
+                                struct hnae3_client *client)
 {
-       struct hclgevf_dev *hdev = ae_dev->priv;
        int ret;
 
        switch (client->type) {
@@ -1653,11 +1652,9 @@ static int hclgevf_init_client_instance(struct hnae3_client *client,
        return 0;
 }
 
-static void hclgevf_uninit_client_instance(struct hnae3_client *client,
-                                          struct hnae3_ae_dev *ae_dev)
+static void hclgevf_uninit_instance(struct hclgevf_dev *hdev,
+                                   struct hnae3_client *client)
 {
-       struct hclgevf_dev *hdev = ae_dev->priv;
-
        /* un-init roce, if it exists */
        if (hdev->roce_client)
                hdev->roce_client->ops->uninit_instance(&hdev->roce, 0);
@@ -1668,6 +1665,22 @@ static void hclgevf_uninit_client_instance(struct hnae3_client *client,
                client->ops->uninit_instance(&hdev->nic, 0);
 }
 
+static int hclgevf_register_client(struct hnae3_client *client,
+                                  struct hnae3_ae_dev *ae_dev)
+{
+       struct hclgevf_dev *hdev = ae_dev->priv;
+
+       return hclgevf_init_instance(hdev, client);
+}
+
+static void hclgevf_unregister_client(struct hnae3_client *client,
+                                     struct hnae3_ae_dev *ae_dev)
+{
+       struct hclgevf_dev *hdev = ae_dev->priv;
+
+       hclgevf_uninit_instance(hdev, client);
+}
+
 static int hclgevf_pci_init(struct hclgevf_dev *hdev)
 {
        struct pci_dev *pdev = hdev->pdev;
@@ -1928,8 +1941,8 @@ void hclgevf_update_speed_duplex(struct hclgevf_dev *hdev, u32 speed,
 static const struct hnae3_ae_ops hclgevf_ops = {
        .init_ae_dev = hclgevf_init_ae_dev,
        .uninit_ae_dev = hclgevf_uninit_ae_dev,
-       .init_client_instance = hclgevf_init_client_instance,
-       .uninit_client_instance = hclgevf_uninit_client_instance,
+       .init_client_instance = hclgevf_register_client,
+       .uninit_client_instance = hclgevf_unregister_client,
        .start = hclgevf_ae_start,
        .stop = hclgevf_ae_stop,
        .map_ring_to_vector = hclgevf_map_ring_to_vector,