mirror of https://gitee.com/openkylin/linux.git
cris: intmem: fix device_initcall compile warning
Cannot add __init macro to crisv32_intmem_init, since the function is being called by other functions. Creating a wrapper instead. arch/cris/arch-v32/mm/intmem.c: At top level: arch/cris/arch-v32/mm/intmem.c:148:17: warning: initialization from incompatible pointer type device_initcall(crisv32_intmem_init); ^ include/linux/init.h:184:58: note: in definition of macro ‘__define_initcall’ __attribute__((__section__(".initcall" #id ".init"))) = fn; \ arch/cris/arch-v32/mm/intmem.c:148:1: note: in expansion of macro ‘device_initcall’ device_initcall(crisv32_intmem_init); ^ Signed-off-by: Niklas Cassel <nks@flawful.org> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
parent
7d1e042314
commit
9d74179a22
|
@ -145,5 +145,12 @@ unsigned long crisv32_intmem_virt_to_phys(void* addr)
|
||||||
(unsigned long)intmem_virtual + MEM_INTMEM_START +
|
(unsigned long)intmem_virtual + MEM_INTMEM_START +
|
||||||
RESERVED_SIZE);
|
RESERVED_SIZE);
|
||||||
}
|
}
|
||||||
device_initcall(crisv32_intmem_init);
|
|
||||||
|
static int __init crisv32_intmem_setup(void)
|
||||||
|
{
|
||||||
|
crisv32_intmem_init();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
device_initcall(crisv32_intmem_setup);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue