diff options
author | Manjunath Kondaiah G <manjugk@ti.com> | 2010-10-08 10:01:13 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:12:38 -0700 |
commit | bead4375731ad283cccbcbcb55bc7549c9746168 (patch) | |
tree | 69ed0ac0e652891593c367530888e2046a04f213 /arch/arm/mach-omap2/board-ldp.c | |
parent | b0a330dc5eff6b27cce3b7b5dbea9379d969f73e (diff) | |
download | op-kernel-dev-bead4375731ad283cccbcbcb55bc7549c9746168.zip op-kernel-dev-bead4375731ad283cccbcbcb55bc7549c9746168.tar.gz |
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 38c4451..7c1e6ad 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -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), |