aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-01-06 21:30:21 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-01-17 03:27:55 -0500
commit1c407a1b24debecccc42e5a2ae167f058dbb6fba (patch)
tree8cfb4d81f413b5f77a02e1f4d894ba709fa5b27b
parent154b7a489a5b1d808323b933b04864958c2f1056 (diff)
Input: tegra-kbc - fix build warning
Fix the following build warning when building driver with CONFIG_PM_SLEEP not selected. tegra-kbc.c:360:13: warning: 'tegra_kbc_set_keypress_interrupt' defined but not used [-Wunused-function] Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/keyboard/tegra-kbc.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index c76f96872d31..f1d3ba0dafb2 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -357,18 +357,6 @@ static void tegra_kbc_set_fifo_interrupt(struct tegra_kbc *kbc, bool enable)
357 writel(val, kbc->mmio + KBC_CONTROL_0); 357 writel(val, kbc->mmio + KBC_CONTROL_0);
358} 358}
359 359
360static void tegra_kbc_set_keypress_interrupt(struct tegra_kbc *kbc, bool enable)
361{
362 u32 val;
363
364 val = readl(kbc->mmio + KBC_CONTROL_0);
365 if (enable)
366 val |= KBC_CONTROL_KEYPRESS_INT_EN;
367 else
368 val &= ~KBC_CONTROL_KEYPRESS_INT_EN;
369 writel(val, kbc->mmio + KBC_CONTROL_0);
370}
371
372static void tegra_kbc_keypress_timer(unsigned long data) 360static void tegra_kbc_keypress_timer(unsigned long data)
373{ 361{
374 struct tegra_kbc *kbc = (struct tegra_kbc *)data; 362 struct tegra_kbc *kbc = (struct tegra_kbc *)data;
@@ -866,6 +854,18 @@ static int tegra_kbc_remove(struct platform_device *pdev)
866} 854}
867 855
868#ifdef CONFIG_PM_SLEEP 856#ifdef CONFIG_PM_SLEEP
857static void tegra_kbc_set_keypress_interrupt(struct tegra_kbc *kbc, bool enable)
858{
859 u32 val;
860
861 val = readl(kbc->mmio + KBC_CONTROL_0);
862 if (enable)
863 val |= KBC_CONTROL_KEYPRESS_INT_EN;
864 else
865 val &= ~KBC_CONTROL_KEYPRESS_INT_EN;
866 writel(val, kbc->mmio + KBC_CONTROL_0);
867}
868
869static int tegra_kbc_suspend(struct device *dev) 869static int tegra_kbc_suspend(struct device *dev)
870{ 870{
871 struct platform_device *pdev = to_platform_device(dev); 871 struct platform_device *pdev = to_platform_device(dev);