habanalabs: remove redundant argument in access_dev_mem APIs

Region structure is derived from region type, hence no need to pass
it as an argument.

Signed-off-by: Ofir Bitton <obitton@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/common/debugfs.c b/drivers/misc/habanalabs/common/debugfs.c
index 0f07c2de986b6825f6634594cba7222d98a4f90f..aaf5235a58d5a82b0bc5223e44e8338dfe4b5bf3 100644 (file)
--- a/drivers/misc/habanalabs/common/debugfs.c
+++ b/drivers/misc/habanalabs/common/debugfs.c
@@ -695,8 +695,7 @@ static int hl_access_dev_mem_by_region(struct hl_device *hdev, u64 addr,
                if (addr >= mem_reg->region_base &&
                        addr <= mem_reg->region_base + mem_reg->region_size - acc_size) {
                        *found = true;
-                       return hdev->asic_funcs->access_dev_mem(hdev, mem_reg, i,
-                               addr, val, acc_type);
+                       return hdev->asic_funcs->access_dev_mem(hdev, i, addr, val, acc_type);
                }
        }
        return 0;

diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c
index c42557052f88a736eb42d1d8691c2886e0867674..adf0ff26636c4bd6c6353a8dc469f792871b5856 100644 (file)
--- a/drivers/misc/habanalabs/common/device.c
+++ b/drivers/misc/habanalabs/common/device.c
@@ -245,14 +245,13 @@ int hl_access_cfg_region(struct hl_device *hdev, u64 addr, u64 *val,
  * hl_access_dev_mem - access device memory
  *
  * @hdev: pointer to habanalabs device structure
- * @region: the memory region the address belongs to
  * @region_type: the type of the region the address belongs to
  * @addr: the address to access
  * @val: the value to write from or read to
  * @acc_type: the type of access (r/w, 32/64)
  */
-int hl_access_dev_mem(struct hl_device *hdev, struct pci_mem_region *region,
-               enum pci_region region_type, u64 addr, u64 *val, enum debugfs_access_type acc_type)
+int hl_access_dev_mem(struct hl_device *hdev, enum pci_region region_type,
+                       u64 addr, u64 *val, enum debugfs_access_type acc_type)
 {
        switch (region_type) {
        case PCI_REGION_CFG:

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index c5f9501b1113ba2973c4734ac7cfc68de4bf2e8f..c7401b524aed410f0f2e44840fba287d0a46295c 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -1455,8 +1455,8 @@ struct hl_asic_funcs {
        u32* (*get_stream_master_qid_arr)(void);
        int (*mmu_get_real_page_size)(struct hl_device *hdev, struct hl_mmu_properties *mmu_prop,
                                        u32 page_size, u32 *real_page_size, bool is_dram_addr);
-       int (*access_dev_mem)(struct hl_device *hdev, struct pci_mem_region *region,
-               enum pci_region region_type, u64 addr, u64 *val, enum debugfs_access_type acc_type);
+       int (*access_dev_mem)(struct hl_device *hdev, enum pci_region region_type,
+                               u64 addr, u64 *val, enum debugfs_access_type acc_type);
        u64 (*set_dram_bar_base)(struct hl_device *hdev, u64 addr);
 };
 
@@ -3133,8 +3133,8 @@ void hl_dma_unmap_sgtable(struct hl_device *hdev, struct sg_table *sgt,
                                enum dma_data_direction dir);
 int hl_access_cfg_region(struct hl_device *hdev, u64 addr, u64 *val,
        enum debugfs_access_type acc_type);
-int hl_access_dev_mem(struct hl_device *hdev, struct pci_mem_region *region,
-               enum pci_region region_type, u64 addr, u64 *val, enum debugfs_access_type acc_type);
+int hl_access_dev_mem(struct hl_device *hdev, enum pci_region region_type,
+                       u64 addr, u64 *val, enum debugfs_access_type acc_type);
 int hl_device_open(struct inode *inode, struct file *filp);
 int hl_device_open_ctrl(struct inode *inode, struct file *filp);
 bool hl_device_operational(struct hl_device *hdev,