From: Dirk Behme <dirk.behme@googlemail.com>
Date: Wed, 22 Mar 2006 15:01:42 +0000 (-0800)
Subject: ARM: OMAP: Fix warnings in innovator_ps2:
X-Git-Tag: v2.6.16-omap1~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a5f137d2226e6dcd3b8aa25463ba813ae42ff503;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix warnings in innovator_ps2:

drivers/input/keyboard/innovator_ps2.c:333: warning: 'block'
defined but not used
drivers/input/keyboard/innovator_ps2.c:338: warning:
'innovator_fpga_hid_lock' defined but not used
drivers/input/keyboard/innovator_ps2.c:339: warning:
'innovator_fpga_hid_busy' defined but not used
drivers/input/keyboard/innovator_ps2.c:383: warning:
'innovator_fpga_hid_clear_bits' defined but not used
drivers/input/keyboard/innovator_ps2.c:702: warning:
'verify_init' defined but not used
drivers/input/keyboard/innovator_ps2.c: In function
'innovator_ps2_resume':
drivers/input/keyboard/innovator_ps2.c:1176: warning:
'pmcomm' may be used uninitialized in this function
drivers/input/keyboard/innovator_ps2.c: In function
'innovator_ps2_suspend':
drivers/input/keyboard/innovator_ps2.c:1153: warning:
'pmcomm' may be used uninitialized in this function

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/input/keyboard/innovator_ps2.c b/drivers/input/keyboard/innovator_ps2.c
index c0889dcd5b9..c3bce96b43e 100644
--- a/drivers/input/keyboard/innovator_ps2.c
+++ b/drivers/input/keyboard/innovator_ps2.c
@@ -330,13 +330,10 @@ typedef struct _kdb_report_t {
 
 
 static u8 buffer[JUNO_BUFFER_SIZE];
-static u8 block[JUNO_BLOCK_SIZE];
 
 static void do_hid_tasklet(unsigned long);
 DECLARE_TASKLET(hid_tasklet, do_hid_tasklet, 0);
 static struct innovator_hid_dev *hid;
-static spinlock_t innovator_fpga_hid_lock = SPIN_LOCK_UNLOCKED;
-static atomic_t innovator_fpga_hid_busy = ATOMIC_INIT(0);
 
 struct innovator_hid_dev {
 	struct input_dev mouse, keyboard;
@@ -378,12 +375,6 @@ innovator_fpga_hid_set_bits(u8 x)
 	innovator_fpga_hid_frob(x, x);
 }
 
-static void
-innovator_fpga_hid_clear_bits(u8 x)
-{
-	innovator_fpga_hid_frob(x, 0);
-}
-
 static void
 SS(int value)
 {
@@ -697,13 +688,6 @@ report_async(void * p, int n)
 	return ret;
 }
 
-static int
-verify_init(u8 * p)
-{
-	return (((simple_t *)p)->cmd_code == 0x01) ? 0 : -1;
-}
-
-
 /*
  * Host command helper functions:
  */
@@ -1150,7 +1134,7 @@ static void innovator_ps2_device_release(struct device *dev)
 
 static int innovator_ps2_suspend(struct device *dev, pm_message_t state)
 {
-	u8 pmcomm;
+	u8 pmcomm = 0;
 
 	/*
 	 * Set SUS_STATE in REG_PM_COMM (Page 0 R0).  This will cause
@@ -1173,7 +1157,7 @@ static int innovator_ps2_suspend(struct device *dev, pm_message_t state)
 
 static int innovator_ps2_resume(struct device *dev)
 {
-	u8 pmcomm;
+	u8 pmcomm = 0;
 
 	/*
 	 * Clear SUS_STATE from REG_PM_COMM (Page 0 R0).