Commit bead4375 authored Oct 08, 2010 by Manjunath Kondaiah G Committed by Tony Lindgren Oct 08, 2010

OMAP3: Keypad: Fix incorrect type initializer

The keypad matrix variable declaration is not matching
with structure variable keymap declared in keypad_matrix.h.

Due to this, following sparse warnings are generated with omap3_defconfig.

arch/arm/mach-omap2/board-devkit8000.c:223:14: warning: incorrect type in initializer (different signedness)
arch/arm/mach-omap2/board-devkit8000.c:223:14: expected unsigned int const [usertype] *keymap
arch/arm/mach-omap2/board-devkit8000.c:223:14: got int static [toplevel] *<noident>

arch/arm/mach-omap2/board-ldp.c:107:14: warning: incorrect type in initializer (different signedness)
arch/arm/mach-omap2/board-ldp.c:107:14: expected unsigned int const [usertype] *keymap
arch/arm/mach-omap2/board-ldp.c:107:14: got int static [toplevel] *<noident>

arch/arm/mach-omap2/board-omap3evm.c:472:14: warning: incorrect type in initializer (different signedness)
arch/arm/mach-omap2/board-omap3evm.c:472:14: expected unsigned int const [usertype] *keymap
arch/arm/mach-omap2/board-omap3evm.c:472:14: got int static [toplevel] *<noident>

arch/arm/mach-omap2/board-3430sdp.c:114:14: warning: incorrect type in initializer (different signedness)
arch/arm/mach-omap2/board-3430sdp.c:114:14: expected unsigned int const [usertype] *keymap
arch/arm/mach-omap2/board-3430sdp.c:114:14: got int static [toplevel] *<noident>

arch/arm/mach-omap2/board-rx51-peripherals.c:248:14: warning: incorrect type in initializer (different signedness)
arch/arm/mach-omap2/board-rx51-peripherals.c:248:14: expected unsigned int const [usertype] *keymap
arch/arm/mach-omap2/board-rx51-peripherals.c:248:14: got int static [toplevel] *<noident>

arch/arm/mach-omap2/board-zoom-peripherals.c:88:14: warning: incorrect type in initializer (different signedness)
arch/arm/mach-omap2/board-zoom-peripherals.c:88:14: expected unsigned int const [usertype] *keymap
arch/arm/mach-omap2/board-zoom-peripherals.c:88:14: got int static [toplevel] *<noident>

arch/arm/mach-omap2/board-cm-t35.c:568:14: warning: incorrect type in initializer (different signedness)
arch/arm/mach-omap2/board-cm-t35.c:568:14: expected unsigned int const [usertype] *keymap
arch/arm/mach-omap2/board-cm-t35.c:568:14: got int static [toplevel] *<noident>

arch/arm/mach-omap2/board-omap3stalker.c:415:13: warning: incorrect type in initializer (different signedness)
arch/arm/mach-omap2/board-omap3stalker.c:415:13: expected unsigned int const [usertype] *keymap
arch/arm/mach-omap2/board-omap3stalker.c:415:13: got int static [toplevel] *<noident>

This patch modifies the variable keymap declaration as per declaration in matrix_keymap structure.

Signed-off-by: Manjunath Kondaiah G <manjugk@ti.com>
Cc: linux-input@vger.kernel.org
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent b0a330dc

arch/arm/mach-omap2/board-3430sdp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ static struct cpuidle_params omap3_cpuidle_params_table[] = {
		{1, 10000, 30000, 300000},
		};

		static int board_keymap[] = {
		static uint32_t board_keymap[] = {
		KEY(0, 0, KEY_LEFT),
		KEY(0, 1, KEY_RIGHT),
		KEY(0, 2, KEY_A),

arch/arm/mach-omap2/board-cm-t35.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -559,7 +559,7 @@ static struct twl4030_usb_data cm_t35_usb_data = {
		.usb_mode = T2_USB_MODE_ULPI,
		};

		static int cm_t35_keymap[] = {
		static uint32_t cm_t35_keymap[] = {
		KEY(0, 0, KEY_A), KEY(0, 1, KEY_B), KEY(0, 2, KEY_LEFT),
		KEY(1, 0, KEY_UP), KEY(1, 1, KEY_ENTER), KEY(1, 2, KEY_DOWN),
		KEY(2, 0, KEY_RIGHT), KEY(2, 1, KEY_C), KEY(2, 2, KEY_D),

arch/arm/mach-omap2/board-devkit8000.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ static struct platform_device devkit8000_dss_device = {
		static struct regulator_consumer_supply devkit8000_vdda_dac_supply =
		REGULATOR_SUPPLY("vdda_dac", "omapdss");

		static int board_keymap[] = {
		static uint32_t board_keymap[] = {
		KEY(0, 0, KEY_1),
		KEY(1, 0, KEY_2),
		KEY(2, 0, KEY_3),

arch/arm/mach-omap2/board-ldp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ static struct platform_device ldp_smsc911x_device = {
		},
		};

		static int board_keymap[] = {
		static uint32_t board_keymap[] = {
		KEY(0, 0, KEY_1),
		KEY(1, 0, KEY_2),
		KEY(2, 0, KEY_3),

arch/arm/mach-omap2/board-omap3evm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -447,7 +447,7 @@ static struct twl4030_usb_data omap3evm_usb_data = {
		.usb_mode = T2_USB_MODE_ULPI,
		};

		static int board_keymap[] = {
		static uint32_t board_keymap[] = {
		KEY(0, 0, KEY_LEFT),
		KEY(0, 1, KEY_DOWN),
		KEY(0, 2, KEY_ENTER),

Admin message