[PATCH v2 2/3] ACPI: osl: Reorder acpi_os_map_iomem() __ref annotation
From: Lorenzo Pieralisi <hidden>
Date: 2021-08-02 15:24:23
Also in:
linux-arm-kernel, lkml
Subsystem:
acpi, acpi component architecture (acpica), the rest · Maintainers:
"Rafael J. Wysocki", Saket Dumbre, Linus Torvalds
The __ref annotation has nothing to do with the acpi_os_map_iomem() return value type. Redefine the acpi_os_map_iomem() function prototype to avoid mixing the __ref annotation with the return type declaration. Signed-off-by: Lorenzo Pieralisi <redacted> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: "Rafael J. Wysocki" <redacted> --- drivers/acpi/osl.c | 4 ++-- include/acpi/acpi_io.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 8f67bf0f090b..fdee0c6f4f7f 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c@@ -321,8 +321,8 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) * During early init (when acpi_permanent_mmap has not been set yet) this * routine simply calls __acpi_map_table() to get the job done. */ -void __iomem __ref -*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) +void __iomem *__ref +acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) { struct acpi_ioremap *map; void __iomem *virt;
diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h
index 027faa8883aa..a0094420303f 100644
--- a/include/acpi/acpi_io.h
+++ b/include/acpi/acpi_io.h@@ -16,8 +16,8 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, extern bool acpi_permanent_mmap; -void __iomem __ref -*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size); +void __iomem *__ref +acpi_os_map_iomem(acpi_physical_address phys, acpi_size size); void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size); void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
--
2.31.0