Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1486169

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

Show all headers | View raw

From: Daniel Wagner <daniel.wagner@bmw-carit.de>

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@intel.com>
Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-cris-kernel@axis.com
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] cris: fix a couple of incompatible pointer types Daniel Wagner <wagi@monom.org> - 2016-09-19 08:30 +0200
  [PATCH 2/2] cris: use correct device_init() function signature Daniel Wagner <wagi@monom.org> - 2016-09-19 08:30 +0200
  [PATCH 1/2] cris: don't compare incompatible pointer type Daniel Wagner <wagi@monom.org> - 2016-09-19 08:30 +0200
  Re: [PATCH 0/2] cris: fix a couple of incompatible pointer types Daniel Wagner <wagi@monom.org> - 2016-09-19 09:10 +0200
  Re: [PATCH 0/2] cris: fix a couple of incompatible pointer types Niklas Cassel <nks.gnu@gmail.com> - 2016-09-19 09:10 +0200

csiph-web