5 files changed, 21 insertions, 24 deletions

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 6791be81eb29..839d1c9622f6 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -455,10 +455,10 @@ static void xpad_bulk_out(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+                dbg("%s - urb shutting down with status: %d", __func__, urb->status);
                 break;
         default:
-                dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+                dbg("%s - nonzero urb status received: %d", __func__, urb->status);
         }
 }
 
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 039787f81ed8..69e674ecf19a 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -72,12 +72,9 @@ static unsigned int *col_gpios;
 static void set_col_gpio_val(struct omap_kp *omap_kp, u8 value)
 {
         int col;
-        for (col = 0; col < omap_kp->cols; col++) {
-                if (value & (1 << col))
-                        omap_set_gpio_dataout(col_gpios[col], 1);
-                else
-                        omap_set_gpio_dataout(col_gpios[col], 0);
-        }
+
+        for (col = 0; col < omap_kp->cols; col++)
+                gpio_set_value(col_gpios[col], value & (1 << col));
 }
 
 static u8 get_row_gpio_val(struct omap_kp *omap_kp)
@@ -86,7 +83,7 @@ static u8 get_row_gpio_val(struct omap_kp *omap_kp)
         u8 value = 0;
 
         for (row = 0; row < omap_kp->rows; row++) {
-                if (omap_get_gpio_datain(row_gpios[row]))
+                if (gpio_get_value(row_gpios[row]))
                         value |= (1 << row);
         }
         return value;
@@ -333,23 +330,23 @@ static int __init omap_kp_probe(struct platform_device *pdev)
         if (cpu_is_omap24xx()) {
                 /* Cols: outputs */
                 for (col_idx = 0; col_idx < omap_kp->cols; col_idx++) {
-                        if (omap_request_gpio(col_gpios[col_idx]) < 0) {
+                        if (gpio_request(col_gpios[col_idx], "omap_kp_col") < 0) {
                                 printk(KERN_ERR "Failed to request"
                                        "GPIO%d for keypad\n",
                                        col_gpios[col_idx]);
                                 goto err1;
                         }
-                        omap_set_gpio_direction(col_gpios[col_idx], 0);
+                        gpio_direction_output(col_gpios[col_idx], 0);
                 }
                 /* Rows: inputs */
                 for (row_idx = 0; row_idx < omap_kp->rows; row_idx++) {
-                        if (omap_request_gpio(row_gpios[row_idx]) < 0) {
+                        if (gpio_request(row_gpios[row_idx], "omap_kp_row") < 0) {
                                 printk(KERN_ERR "Failed to request"
                                        "GPIO%d for keypad\n",
                                        row_gpios[row_idx]);
                                 goto err2;
                         }
-                        omap_set_gpio_direction(row_gpios[row_idx], 1);
+                        gpio_direction_input(row_gpios[row_idx]);
                 }
         } else {
                 col_idx = 0;
@@ -418,10 +415,10 @@ err3:
         device_remove_file(&pdev->dev, &dev_attr_enable);
 err2:
         for (i = row_idx - 1; i >=0; i--)
-                omap_free_gpio(row_gpios[i]);
+                gpio_free(row_gpios[i]);
 err1:
         for (i = col_idx - 1; i >=0; i--)
-                omap_free_gpio(col_gpios[i]);
+                gpio_free(col_gpios[i]);
 
         kfree(omap_kp);
         input_free_device(input_dev);
@@ -438,9 +435,9 @@ static int omap_kp_remove(struct platform_device *pdev)
         if (cpu_is_omap24xx()) {
                 int i;
                 for (i = 0; i < omap_kp->cols; i++)
-                        omap_free_gpio(col_gpios[i]);
+                        gpio_free(col_gpios[i]);
                 for (i = 0; i < omap_kp->rows; i++) {
-                        omap_free_gpio(row_gpios[i]);
+                        gpio_free(row_gpios[i]);
                         free_irq(OMAP_GPIO_IRQ(row_gpios[i]), 0);
                 }
         } else {
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index daa9d4220331..82ec6b1b6467 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -458,35 +458,35 @@ static int hp_sdc_rtc_proc_output (char *buf)
                 p += sprintf(p, "i8042 rtc\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "i8042 rtc\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         if (hp_sdc_rtc_read_fhs(&tv)) {
                 p += sprintf(p, "handshake\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "handshake\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         if (hp_sdc_rtc_read_mt(&tv)) {
                 p += sprintf(p, "alarm\t\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "alarm\t\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         if (hp_sdc_rtc_read_dt(&tv)) {
                 p += sprintf(p, "delay\t\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "delay\t\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         if (hp_sdc_rtc_read_ct(&tv)) {
                 p += sprintf(p, "periodic\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "periodic\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         p += sprintf(p,
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 0d395979b2d1..bfe49243f38b 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -323,7 +323,7 @@ static void hp_sdc_tasklet(unsigned long foo)
                          * it back to the application. and be less verbose.
                          */
                         printk(KERN_WARNING PREFIX "read timeout (%ius)!\n",
-                               tv.tv_usec - hp_sdc.rtv.tv_usec);
+                               (int)(tv.tv_usec - hp_sdc.rtv.tv_usec));
                         curr->idx += hp_sdc.rqty;
                         hp_sdc.rqty = 0;
                         tmp = curr->seq[curr->actidx];
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index f451c7351a9d..847f4aad7ed5 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -67,7 +67,7 @@ static inline int i8042_platform_init(void)
  * On some platforms touching the i8042 data register region can do really
  * bad things. Because of this the region is always reserved on such boxes.
  */
-#if defined(CONFIG_PPC_MERGE)
+#if defined(CONFIG_PPC)
         if (check_legacy_ioport(I8042_DATA_REG))
                 return -ENODEV;
 #endif