From c3be44e23d3a57643cb12f8369cf26e9ad339988 Mon Sep 17 00:00:00 2001 From: Sachin Nikam Date: Tue, 25 May 2010 13:44:14 +0530 Subject: warnings: Fixing kernel compilation warnings. Bug 682070 Change-Id: Ieff4ca65dc7034786ddfe0657585d66957bc7f3d Reviewed-on: http://git-master/r/1577 Reviewed-by: Bharat Nihalani Reviewed-by: Sachin Nikam Tested-by: Sachin Nikam Reviewed-by: Gary King --- drivers/input/keyboard/tegra-nvec.c | 4 +--- drivers/input/misc/tegra_odm_scroll.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/input/keyboard/tegra-nvec.c b/drivers/input/keyboard/tegra-nvec.c index 09022289a219..9572a7fd9f03 100644 --- a/drivers/input/keyboard/tegra-nvec.c +++ b/drivers/input/keyboard/tegra-nvec.c @@ -393,7 +393,7 @@ fail: return error; } -static int nvec_keyboard_remove(struct nvec_device *dev) +static void nvec_keyboard_remove(struct nvec_device *dev) { struct input_dev *input_dev = nvec_get_drvdata(dev); struct nvec_keyboard *keyboard = input_get_drvdata(input_dev); @@ -405,8 +405,6 @@ static int nvec_keyboard_remove(struct nvec_device *dev) keyboard->shutdown = 1; input_free_device(input_dev); kfree(keyboard); - - return 0; } static int nvec_keyboard_suspend(struct nvec_device *pdev, pm_message_t state) diff --git a/drivers/input/misc/tegra_odm_scroll.c b/drivers/input/misc/tegra_odm_scroll.c index 6d0022f9cea9..bbfbc8fed26d 100644 --- a/drivers/input/misc/tegra_odm_scroll.c +++ b/drivers/input/misc/tegra_odm_scroll.c @@ -44,7 +44,6 @@ static int scroll_thread(void *pdata) /* FIXME add a terminating condition */ while(1) { - NvU32 value = 0; NvOdmOsSemaphoreWait(scroll->sem); Events = NvOdmScrollWheelGetEvent(scroll->odm_dev); -- cgit v1.2.3