drivers: media: pci: Fix Hailo compile warnings

pelwell · popcornmix · commit 760d8728292a · 2024-09-10T16:56:23.000+01:00
Signed-off-by: Phil Elwell &lt;phil@raspberrypi.com&gt;
diff --git a/drivers/media/pci/hailo/common/pcie_common.c b/drivers/media/pci/hailo/common/pcie_common.c
@@ -656,7 +656,7 @@ int hailo_pcie_write_firmware(struct hailo_pcie_resources *resources, const void
 }
 
 // TODO: HRT-14147 - remove this function
-bool hailo_pcie_is_device_ready_for_boot(struct hailo_pcie_resources *resources)
+static bool hailo_pcie_is_device_ready_for_boot(struct hailo_pcie_resources *resources)
 {
     return hailo_get_boot_status(resources) == BOOT_STATUS_UNINITIALIZED;
 }
diff --git a/drivers/media/pci/hailo/vdma/memory.c b/drivers/media/pci/hailo/vdma/memory.c
@@ -512,6 +512,7 @@ void hailo_vdma_clear_continuous_buffer_list(struct hailo_vdma_file_context *con
  *
  * Return: zero and the pfn at @pfn on success, -ve otherwise.
  */
+#if defined(HAILO_SUPPORT_MMIO_DMA_MAPPING)
 static int follow_pfn(struct vm_area_struct *vma, unsigned long address,
        unsigned long *pfn)
 {
@@ -529,7 +530,7 @@ static int follow_pfn(struct vm_area_struct *vma, unsigned long address,
        pte_unmap_unlock(ptep, ptl);
        return 0;
 }
-
+#endif
 
 // Assumes the provided user_address belongs to the vma and that MMIO_AND_NO_PAGES_VMA_MASK bits are set under
 // vma->vm_flags. This is validated in hailo_vdma_buffer_map, and won't be checked here

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ int hailo_pcie_write_firmware(struct hailo_pcie_resources *resources, const void`
`656`	`656`	`}`
`657`	`657`
`658`	`658`	`// TODO: HRT-14147 - remove this function`
`659`		`-bool hailo_pcie_is_device_ready_for_boot(struct hailo_pcie_resources *resources)`
	`659`	`+static bool hailo_pcie_is_device_ready_for_boot(struct hailo_pcie_resources *resources)`
`660`	`660`	`{`
`661`	`661`	`return hailo_get_boot_status(resources) == BOOT_STATUS_UNINITIALIZED;`
`662`	`662`	`}`
Original file line number	Diff line number	Diff line change
`@@ -512,6 +512,7 @@ void hailo_vdma_clear_continuous_buffer_list(struct hailo_vdma_file_context *con`
`512`	`512`	`*`
`513`	`513`	`* Return: zero and the pfn at @pfn on success, -ve otherwise.`
`514`	`514`	`*/`
	`515`	`+#if defined(HAILO_SUPPORT_MMIO_DMA_MAPPING)`
`515`	`516`	`static int follow_pfn(struct vm_area_struct *vma, unsigned long address,`
`516`	`517`	`unsigned long *pfn)`
`517`	`518`	`{`
`@@ -529,7 +530,7 @@ static int follow_pfn(struct vm_area_struct *vma, unsigned long address,`
`529`	`530`	`pte_unmap_unlock(ptep, ptl);`
`530`	`531`	`return 0;`
`531`	`532`	`}`
`532`		`-`
	`533`	`+#endif`
`533`	`534`
`534`	`535`	`// Assumes the provided user_address belongs to the vma and that MMIO_AND_NO_PAGES_VMA_MASK bits are set under`
`535`	`536`	`// vma->vm_flags. This is validated in hailo_vdma_buffer_map, and won't be checked here`