habanalabs: unify hwmon resources clean up

Since hwmon fini code is common for all asics, unified it to common
function.

Signed-off-by: Dani Liberman <dliberman@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index ae3f5832fe58273079ec3f579035e21085e1fe54..f495a4b82f73c9ce478dad360cb78569a75024d7 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -3529,6 +3529,7 @@ void hl_sysfs_fini(struct hl_device *hdev);
 
 int hl_hwmon_init(struct hl_device *hdev);
 void hl_hwmon_fini(struct hl_device *hdev);
+void hl_hwmon_release_resources(struct hl_device *hdev);
 
 int hl_cb_create(struct hl_device *hdev, struct hl_mem_mgr *mmg,
                        struct hl_ctx *ctx, u32 cb_size, bool internal_cb,

diff --git a/drivers/misc/habanalabs/common/hwmon.c b/drivers/misc/habanalabs/common/hwmon.c
index 57f5d2c483305e30de2392cd4d68226df5d947c8..8c262aeb425e6363ee4ceeb484670e29bf2dd389 100644 (file)
--- a/drivers/misc/habanalabs/common/hwmon.c
+++ b/drivers/misc/habanalabs/common/hwmon.c
@@ -910,3 +910,24 @@ void hl_hwmon_fini(struct hl_device *hdev)
 
        hwmon_device_unregister(hdev->hwmon_dev);
 }
+
+void hl_hwmon_release_resources(struct hl_device *hdev)
+{
+       const struct hwmon_channel_info **channel_info_arr;
+       int i = 0;
+
+       if (!hdev->hl_chip_info->info)
+               return;
+
+       channel_info_arr = hdev->hl_chip_info->info;
+
+       while (channel_info_arr[i]) {
+               kfree(channel_info_arr[i]->config);
+               kfree(channel_info_arr[i]);
+               i++;
+       }
+
+       kfree(channel_info_arr);
+
+       hdev->hl_chip_info->info = NULL;
+}

diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
index 7f52935dc603136cde665085e36d5c0dea8af92c..96020693ac29917e723b8e91f9e2ce4db4ca9c91 100644 (file)
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
@@ -1682,23 +1682,7 @@ disable_pci_access:
 
 static void gaudi_late_fini(struct hl_device *hdev)
 {
-       const struct hwmon_channel_info **channel_info_arr;
-       int i = 0;
-
-       if (!hdev->hl_chip_info->info)
-               return;
-
-       channel_info_arr = hdev->hl_chip_info->info;
-
-       while (channel_info_arr[i]) {
-               kfree(channel_info_arr[i]->config);
-               kfree(channel_info_arr[i]);
-               i++;
-       }
-
-       kfree(channel_info_arr);
-
-       hdev->hl_chip_info->info = NULL;
+       hl_hwmon_release_resources(hdev);
 }
 
 static int gaudi_alloc_cpu_accessible_dma_mem(struct hl_device *hdev)

diff --git a/drivers/misc/habanalabs/gaudi2/gaudi2.c b/drivers/misc/habanalabs/gaudi2/gaudi2.c
index 676419961f867201d6c96ea40ff41b4c6571d524..fa806e5b66801b192b70b73ce57bc9a40d313d93 100644 (file)
--- a/drivers/misc/habanalabs/gaudi2/gaudi2.c
+++ b/drivers/misc/habanalabs/gaudi2/gaudi2.c
@@ -2711,23 +2711,7 @@ disable_pci_access:
 
 static void gaudi2_late_fini(struct hl_device *hdev)
 {
-       const struct hwmon_channel_info **channel_info_arr;
-       int i = 0;
-
-       if (!hdev->hl_chip_info->info)
-               return;
-
-       channel_info_arr = hdev->hl_chip_info->info;
-
-       while (channel_info_arr[i]) {
-               kfree(channel_info_arr[i]->config);
-               kfree(channel_info_arr[i]);
-               i++;
-       }
-
-       kfree(channel_info_arr);
-
-       hdev->hl_chip_info->info = NULL;
+       hl_hwmon_release_resources(hdev);
 }
 
 static void gaudi2_user_mapped_dec_init(struct gaudi2_device *gaudi2, u32 start_idx)

diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index 91429d6ea037e739aeb8b4759b751cfd02a637df..87465a28af0d5aa80913aace998e402bf793fe27 100644 (file)
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -916,26 +916,11 @@ int goya_late_init(struct hl_device *hdev)
  */
 void goya_late_fini(struct hl_device *hdev)
 {
-       const struct hwmon_channel_info **channel_info_arr;
        struct goya_device *goya = hdev->asic_specific;
-       int i = 0;
 
        cancel_delayed_work_sync(&goya->goya_work->work_freq);
 
-       if (!hdev->hl_chip_info->info)
-               return;
-
-       channel_info_arr = hdev->hl_chip_info->info;
-
-       while (channel_info_arr[i]) {
-               kfree(channel_info_arr[i]->config);
-               kfree(channel_info_arr[i]);
-               i++;
-       }
-
-       kfree(channel_info_arr);
-
-       hdev->hl_chip_info->info = NULL;
+       hl_hwmon_release_resources(hdev);
 }
 
 static void goya_set_pci_memory_regions(struct hl_device *hdev)