Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c9a58e8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI / boot: Correct address space of __acpi_map_table() 



Sparse complains about wrong address space used in __acpi_map_table()
and in __acpi_unmap_table().

arch/x86/kernel/acpi/boot.c:127:29: warning: incorrect type in return expression (different address spaces)
arch/x86/kernel/acpi/boot.c:127:29:    expected char *
arch/x86/kernel/acpi/boot.c:127:29:    got void [noderef] <asn:2>*
arch/x86/kernel/acpi/boot.c:135:23: warning: incorrect type in argument 1 (different address spaces)
arch/x86/kernel/acpi/boot.c:135:23:    expected void [noderef] <asn:2>*addr
arch/x86/kernel/acpi/boot.c:135:23:    got char *map

Correct address space to be in align of type of returned and passed
parameter.

Reviewed-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 861a6ee8

arch/arm64/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int __init dt_scan_depth1_nodes(unsigned long node, 
 * __acpi_map_table() will be called before page_init(), so early_ioremap()

 * or early_memremap() should be called here to for ACPI table mapping.

 */

char *__init __acpi_map_table(unsigned long phys, unsigned long size)

void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)

{

	if (!size)

		return NULL;
@@ -103,7 +103,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) 
	return early_memremap(phys, size);

}



void __init __acpi_unmap_table(char *map, unsigned long size)

void __init __acpi_unmap_table(void __iomem *map, unsigned long size)

{

	if (!map || !size)

		return;

arch/ia64/kernel/acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -159,12 +159,12 @@ int acpi_request_vector(u32 int_type) 
	return vector;

}



char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)

void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)

{

	return __va(phys_addr);

	return __va(phys);

}



void __init __acpi_unmap_table(char *map, unsigned long size)

void __init __acpi_unmap_table(void __iomem *map, unsigned long size)

{

}

arch/x86/kernel/acpi/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = { 
 * This is just a simple wrapper around early_ioremap(),

 * with sanity checks for phys == 0 and size == 0.

 */

char *__init __acpi_map_table(unsigned long phys, unsigned long size)

void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)

{



	if (!phys || !size)
@@ -127,7 +127,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) 
	return early_ioremap(phys, size);

}



void __init __acpi_unmap_table(char *map, unsigned long size)

void __init __acpi_unmap_table(void __iomem *map, unsigned long size)

{

	if (!map || !size)

		return;

include/linux/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -228,8 +228,8 @@ struct acpi_subtable_proc { 
	int count;

};



char * __acpi_map_table (unsigned long phys_addr, unsigned long size);

void __acpi_unmap_table(char *map, unsigned long size);

void __iomem *__acpi_map_table(unsigned long phys, unsigned long size);

void __acpi_unmap_table(void __iomem *map, unsigned long size);

int early_acpi_boot_init(void);

int acpi_boot_init (void);

void acpi_boot_table_init (void);