[PATCH] fix-compile-warnings.patch

[Andy Green]

fix-compile-warnings.patch

From: warmcat <[EMAIL PROTECTED]>

Couple of our files generate compile warnings - fix 'em.

Also the fail paths on gta01kbd_probe() were broken, fixed.

Signed-off-by: Andy Green <[EMAIL PROTECTED]>
---

 drivers/i2c/chips/pcf50633.c       |    4 ++--
 drivers/input/keyboard/qt2410kbd.c |   37 +++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)


diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
index bf025a0..2972d67 100644
--- a/drivers/i2c/chips/pcf50633.c
+++ b/drivers/i2c/chips/pcf50633.c
@@ -908,9 +908,9 @@ static inline int16_t rntc_to_temp(u_int16_t rntc)
 static ssize_t show_battemp(struct device *dev, struct device_attribute *attr,
 			    char *buf)
 {
+#if 0
 	struct i2c_client *client = to_i2c_client(dev);
 	struct pcf50633_data *pcf = i2c_get_clientdata(client);
-#if 0
 	u_int16_t adc;
 
 	adc = adc_read(pcf, PCF50633_ADCC1_MUX_BATTEMP, 0, NULL);
@@ -932,9 +932,9 @@ static inline u_int16_t adc_to_chg_milliamps(struct pcf50633_data *pcf,
 static ssize_t show_chgcur(struct device *dev, struct device_attribute *attr,
 			   char *buf)
 {
+#if 0
 	struct i2c_client *client = to_i2c_client(dev);
 	struct pcf50633_data *pcf = i2c_get_clientdata(client);
-#if 0
 	u_int16_t adc_batvolt, adc_adcin1;
 	u_int16_t ma;
 
diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
index c631d97..4d497a3 100644
--- a/drivers/input/keyboard/qt2410kbd.c
+++ b/drivers/input/keyboard/qt2410kbd.c
@@ -48,7 +48,6 @@ static irqreturn_t gta01kbd_interrupt(int irq, void *dev_id)
 #ifdef CONFIG_PM
 static int gta01kbd_suspend(struct platform_device *dev, pm_message_t state)
 {
-	int i;
 	struct gta01kbd *gta01kbd = platform_get_drvdata(dev);
 
 	gta01kbd->suspended = 1;
@@ -58,7 +57,6 @@ static int gta01kbd_suspend(struct platform_device *dev, pm_message_t state)
 
 static int gta01kbd_resume(struct platform_device *dev)
 {
-	int i;
 	struct gta01kbd *gta01kbd = platform_get_drvdata(dev);
 
 	gta01kbd->suspended = 0;
@@ -74,22 +72,30 @@ static int gta01kbd_probe(struct platform_device *pdev)
 {
 	struct gta01kbd *gta01kbd;
 	struct input_dev *input_dev;
-	int irq_911, irq_hold;
+	int irq_911;
+	int rc = 0;
 
 	gta01kbd = kzalloc(sizeof(struct gta01kbd), GFP_KERNEL);
+	if (!gta01kbd) {
+		rc = -ENOMEM;
+		goto bail;
+	}
 	input_dev = input_allocate_device();
 	if (!gta01kbd || !input_dev) {
-		kfree(gta01kbd);
-		input_free_device(input_dev);
-		return -ENOMEM;
+		rc = -ENOMEM;
+		goto bail_free;
 	}
 
-	if (pdev->resource[0].flags != 0)
-		return -EINVAL;
+	if (pdev->resource[0].flags != 0) {\
+		rc = -EINVAL;
+		goto bail_free_dev;
+	}
 
 	irq_911 = s3c2410_gpio_getirq(pdev->resource[0].start);
-	if (irq_911 < 0)
-		return -EINVAL;
+	if (irq_911 < 0) {
+		rc = -EINVAL;
+		goto bail_free_dev;
+	}
 
 	platform_set_drvdata(pdev, gta01kbd);
 
@@ -135,7 +141,9 @@ static int gta01kbd_probe(struct platform_device *pdev)
 	set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
 #endif
 
-	input_register_device(gta01kbd->input);
+	rc = input_register_device(gta01kbd->input);
+	if (rc)
+		goto bail_free_dev;
 
 	s3c2410_gpio_cfgpin(S3C2410_GPF0, S3C2410_GPF0_EINT0);
 	if (request_irq(irq_911, gta01kbd_interrupt,
@@ -167,6 +175,13 @@ static int gta01kbd_probe(struct platform_device *pdev)
 #endif
 
 	return 0;
+
+bail_free_dev:
+	input_free_device(input_dev);
+bail_free:
+	kfree(gta01kbd);
+bail:
+	return rc;
 }
 
 static int gta01kbd_remove(struct platform_device *pdev)