[PATCH 2/2] cris: use correct device_init() function signature

From: Daniel Wagner
Date: Mon Sep 19 2016 - 02:28:51 EST


From: Daniel Wagner <daniel.wagner@xxxxxxxxxxxx>

The crisv32_intem_init() function doesn't match the necessary callback
function signature. Newer gcc version are checking the pointer types
and through an error if they don't match.

Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
Signed-off-by: Daniel Wagner <daniel.wagner@xxxxxxxxxxxx>
Cc: Mikael Starvik <starvik@xxxxxxxx>
Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
Cc: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Cc: linux-cris-kernel@xxxxxxxx
---
arch/cris/arch-v32/mm/intmem.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/cris/arch-v32/mm/intmem.c b/arch/cris/arch-v32/mm/intmem.c
index cfe393e..f5c2273 100644
--- a/arch/cris/arch-v32/mm/intmem.c
+++ b/arch/cris/arch-v32/mm/intmem.c
@@ -29,7 +29,7 @@ struct intmem_allocation {
static struct list_head intmem_allocations;
static void* intmem_virtual;

-static void crisv32_intmem_init(void)
+static int __init crisv32_intmem_init(void)
{
static int initiated = 0;
if (!initiated) {
@@ -44,6 +44,8 @@ static void crisv32_intmem_init(void)
alloc->status = STATUS_FREE;
list_add_tail(&alloc->entry, &intmem_allocations);
}
+
+ return 0;
}

void* crisv32_intmem_alloc(unsigned size, unsigned align)
--
2.7.4