6 files changed, 19 insertions, 21 deletions

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index cf5af1f495ec..e229fa3cad96 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -767,9 +767,8 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)
                       psmouse->packet[5]) & 0x80) ||
                     (!alps_is_valid_first_byte(priv->i, psmouse->packet[6]))) {
                         psmouse_dbg(psmouse,
-                                    "refusing packet %x %x %x %x (suspected interleaved ps/2)\n",
-                                    psmouse->packet[3], psmouse->packet[4],
-                                    psmouse->packet[5], psmouse->packet[6]);
+                                    "refusing packet %4ph (suspected interleaved ps/2)\n",
+                                    psmouse->packet + 3);
                         return PSMOUSE_BAD_DATA;
                 }
 
@@ -831,9 +830,8 @@ static void alps_flush_packet(unsigned long data)
                      psmouse->packet[4] |
                      psmouse->packet[5]) & 0x80) {
                         psmouse_dbg(psmouse,
-                                    "refusing packet %x %x %x (suspected interleaved ps/2)\n",
-                                    psmouse->packet[3], psmouse->packet[4],
-                                    psmouse->packet[5]);
+                                    "refusing packet %3ph (suspected interleaved ps/2)\n",
+                                    psmouse->packet + 3);
                 } else {
                         alps_process_packet(psmouse);
                 }
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 39fe9b737cae..532eaca4cc56 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -46,7 +46,7 @@ static void gpio_mouse_scan(struct input_polled_dev *dev)
         input_sync(input);
 }
 
-static int __devinit gpio_mouse_probe(struct platform_device *pdev)
+static int gpio_mouse_probe(struct platform_device *pdev)
 {
         struct gpio_mouse_platform_data *pdata = pdev->dev.platform_data;
         struct input_polled_dev *input_poll;
@@ -150,7 +150,7 @@ static int __devinit gpio_mouse_probe(struct platform_device *pdev)
         return error;
 }
 
-static int __devexit gpio_mouse_remove(struct platform_device *pdev)
+static int gpio_mouse_remove(struct platform_device *pdev)
 {
         struct input_polled_dev *input = platform_get_drvdata(pdev);
         struct gpio_mouse_platform_data *pdata = input->private;
@@ -172,7 +172,7 @@ static int __devexit gpio_mouse_remove(struct platform_device *pdev)
 
 static struct platform_driver gpio_mouse_device_driver = {
         .probe          = gpio_mouse_probe,
-        .remove         = __devexit_p(gpio_mouse_remove),
+        .remove         = gpio_mouse_remove,
         .driver         = {
                 .name   = "gpio_mouse",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/mouse/maplemouse.c b/drivers/input/mouse/maplemouse.c
index 5f278176eb9b..0a60717b91c6 100644
--- a/drivers/input/mouse/maplemouse.c
+++ b/drivers/input/mouse/maplemouse.c
@@ -64,7 +64,7 @@ static void dc_mouse_close(struct input_dev *dev)
 }
 
 /* allow the mouse to be used */
-static int __devinit probe_maple_mouse(struct device *dev)
+static int probe_maple_mouse(struct device *dev)
 {
         struct maple_device *mdev = to_maple_dev(dev);
         struct maple_driver *mdrv = to_maple_driver(dev->driver);
@@ -114,7 +114,7 @@ fail:
         return error;
 }
 
-static int __devexit remove_maple_mouse(struct device *dev)
+static int remove_maple_mouse(struct device *dev)
 {
         struct maple_device *mdev = to_maple_dev(dev);
         struct dc_mouse *mse = maple_get_drvdata(mdev);
@@ -132,7 +132,7 @@ static struct maple_driver dc_mouse_driver = {
         .drv = {
                 .name = "Dreamcast_mouse",
                 .probe = probe_maple_mouse,
-                .remove = __devexit_p(remove_maple_mouse),
+                .remove = remove_maple_mouse,
         },
 };
 
diff --git a/drivers/input/mouse/navpoint.c b/drivers/input/mouse/navpoint.c
index c29ae7654d5e..8e1b98ea5648 100644
--- a/drivers/input/mouse/navpoint.c
+++ b/drivers/input/mouse/navpoint.c
@@ -206,7 +206,7 @@ static void navpoint_close(struct input_dev *input)
         navpoint_down(navpoint);
 }
 
-static int __devinit navpoint_probe(struct platform_device *pdev)
+static int navpoint_probe(struct platform_device *pdev)
 {
         const struct navpoint_platform_data *pdata =
                                         dev_get_platdata(&pdev->dev);
@@ -299,7 +299,7 @@ err_free_gpio:
         return error;
 }
 
-static int __devexit navpoint_remove(struct platform_device *pdev)
+static int navpoint_remove(struct platform_device *pdev)
 {
         const struct navpoint_platform_data *pdata =
                                         dev_get_platdata(&pdev->dev);
@@ -353,7 +353,7 @@ static SIMPLE_DEV_PM_OPS(navpoint_pm_ops, navpoint_suspend, navpoint_resume);
 
 static struct platform_driver navpoint_driver = {
         .probe          = navpoint_probe,
-        .remove         = __devexit_p(navpoint_remove),
+        .remove         = navpoint_remove,
         .driver = {
                 .name   = "navpoint",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c
index 4fe055f2c536..0ecb9e7945eb 100644
--- a/drivers/input/mouse/pxa930_trkball.c
+++ b/drivers/input/mouse/pxa930_trkball.c
@@ -143,7 +143,7 @@ static void pxa930_trkball_close(struct input_dev *dev)
         pxa930_trkball_disable(trkball);
 }
 
-static int __devinit pxa930_trkball_probe(struct platform_device *pdev)
+static int pxa930_trkball_probe(struct platform_device *pdev)
 {
         struct pxa930_trkball *trkball;
         struct input_dev *input;
@@ -230,7 +230,7 @@ failed:
         return error;
 }
 
-static int __devexit pxa930_trkball_remove(struct platform_device *pdev)
+static int pxa930_trkball_remove(struct platform_device *pdev)
 {
         struct pxa930_trkball *trkball = platform_get_drvdata(pdev);
         int irq = platform_get_irq(pdev, 0);
@@ -248,7 +248,7 @@ static struct platform_driver pxa930_trkball_driver = {
                 .name   = "pxa930-trkball",
         },
         .probe          = pxa930_trkball_probe,
-        .remove         = __devexit_p(pxa930_trkball_remove),
+        .remove         = pxa930_trkball_remove,
 };
 module_platform_driver(pxa930_trkball_driver);
 
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c
index 063a174d3a88..ad822608f6ee 100644
--- a/drivers/input/mouse/synaptics_i2c.c
+++ b/drivers/input/mouse/synaptics_i2c.c
@@ -535,7 +535,7 @@ static struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *clien
         return touch;
 }
 
-static int __devinit synaptics_i2c_probe(struct i2c_client *client,
+static int synaptics_i2c_probe(struct i2c_client *client,
                                const struct i2c_device_id *dev_id)
 {
         int ret;
@@ -601,7 +601,7 @@ err_mem_free:
         return ret;
 }
 
-static int __devexit synaptics_i2c_remove(struct i2c_client *client)
+static int synaptics_i2c_remove(struct i2c_client *client)
 {
         struct synaptics_i2c *touch = i2c_get_clientdata(client);
 
@@ -662,7 +662,7 @@ static struct i2c_driver synaptics_i2c_driver = {
         },
 
         .probe          = synaptics_i2c_probe,
-        .remove         = __devexit_p(synaptics_i2c_remove),
+        .remove         = synaptics_i2c_remove,
 
         .id_table       = synaptics_i2c_id_table,
 };