Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / input / mouse / psmouse-base.c

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 3f74bae..9f352fb 100644 (file)
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -11,6 +11,9 @@
  * the Free Software Foundation.
  */
 
+#define pr_fmt(fmt)            KBUILD_MODNAME ": " fmt
+#define psmouse_fmt(fmt)       fmt
+
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -251,11 +254,14 @@ static int psmouse_handle_byte(struct psmouse *psmouse)
        switch (rc) {
        case PSMOUSE_BAD_DATA:
                if (psmouse->state == PSMOUSE_ACTIVATED) {
-                       printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
-                               psmouse->name, psmouse->phys, psmouse->pktcnt);
+                       psmouse_warn(psmouse,
+                                    "%s at %s lost sync at byte %d\n",
+                                    psmouse->name, psmouse->phys,
+                                    psmouse->pktcnt);
                        if (++psmouse->out_of_sync_cnt == psmouse->resetafter) {
                                __psmouse_set_state(psmouse, PSMOUSE_IGNORE);
-                               printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
+                               psmouse_notice(psmouse,
+                                               "issuing reconnect request\n");
                                serio_reconnect(psmouse->ps2dev.serio);
                                return -1;
                        }
@@ -267,8 +273,9 @@ static int psmouse_handle_byte(struct psmouse *psmouse)
                psmouse->pktcnt = 0;
                if (psmouse->out_of_sync_cnt) {
                        psmouse->out_of_sync_cnt = 0;
-                       printk(KERN_NOTICE "psmouse.c: %s at %s - driver resynched.\n",
-                               psmouse->name, psmouse->phys);
+                       psmouse_notice(psmouse,
+                                       "%s at %s - driver resynced.\n",
+                                       psmouse->name, psmouse->phys);
                }
                break;
 
@@ -295,9 +302,10 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
                     ((flags & SERIO_PARITY) && !psmouse->ignore_parity))) {
 
                if (psmouse->state == PSMOUSE_ACTIVATED)
-                       printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
-                               flags & SERIO_TIMEOUT ? " timeout" : "",
-                               flags & SERIO_PARITY ? " bad parity" : "");
+                       psmouse_warn(psmouse,
+                                    "bad data from KBC -%s%s\n",
+                                    flags & SERIO_TIMEOUT ? " timeout" : "",
+                                    flags & SERIO_PARITY ? " bad parity" : "");
                ps2_cmd_aborted(&psmouse->ps2dev);
                goto out;
        }
@@ -315,8 +323,8 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
 
        if (psmouse->state == PSMOUSE_ACTIVATED &&
            psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
-               printk(KERN_INFO "psmouse.c: %s at %s lost synchronization, throwing %d bytes away.\n",
-                      psmouse->name, psmouse->phys, psmouse->pktcnt);
+               psmouse_info(psmouse, "%s at %s lost synchronization, throwing %d bytes away.\n",
+                            psmouse->name, psmouse->phys, psmouse->pktcnt);
                psmouse->badbyte = psmouse->packet[0];
                __psmouse_set_state(psmouse, PSMOUSE_RESYNCING);
                psmouse_queue_work(psmouse, &psmouse->resync_work, 0);
@@ -943,7 +951,8 @@ static int psmouse_probe(struct psmouse *psmouse)
  */
 
        if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_DIS))
-               printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", ps2dev->serio->phys);
+               psmouse_warn(psmouse, "Failed to reset mouse on %s\n",
+                            ps2dev->serio->phys);
 
        return 0;
 }
@@ -1005,8 +1014,8 @@ static void psmouse_initialize(struct psmouse *psmouse)
 static void psmouse_activate(struct psmouse *psmouse)
 {
        if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE))
-               printk(KERN_WARNING "psmouse.c: Failed to enable mouse on %s\n",
-                       psmouse->ps2dev.serio->phys);
+               psmouse_warn(psmouse, "Failed to enable mouse on %s\n",
+                            psmouse->ps2dev.serio->phys);
 
        psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
 }
@@ -1020,14 +1029,14 @@ static void psmouse_activate(struct psmouse *psmouse)
 static void psmouse_deactivate(struct psmouse *psmouse)
 {
        if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE))
-               printk(KERN_WARNING "psmouse.c: Failed to deactivate mouse on %s\n",
-                       psmouse->ps2dev.serio->phys);
+               psmouse_warn(psmouse, "Failed to deactivate mouse on %s\n",
+                            psmouse->ps2dev.serio->phys);
 
        psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
 }
 
 /*
- * psmouse_poll() - default poll hanlder. Everyone except for ALPS uses it.
+ * psmouse_poll() - default poll handler. Everyone except for ALPS uses it.
  */
 
 static int psmouse_poll(struct psmouse *psmouse)
@@ -1115,14 +1124,15 @@ static void psmouse_resync(struct work_struct *work)
        }
 
        if (!enabled) {
-               printk(KERN_WARNING "psmouse.c: failed to re-enable mouse on %s\n",
-                       psmouse->ps2dev.serio->phys);
+               psmouse_warn(psmouse, "failed to re-enable mouse on %s\n",
+                            psmouse->ps2dev.serio->phys);
                failed = true;
        }
 
        if (failed) {
                psmouse_set_state(psmouse, PSMOUSE_IGNORE);
-               printk(KERN_INFO "psmouse.c: resync failed, issuing reconnect request\n");
+               psmouse_info(psmouse,
+                            "resync failed, issuing reconnect request\n");
                serio_reconnect(serio);
        } else
                psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
@@ -1155,8 +1165,8 @@ static void psmouse_cleanup(struct serio *serio)
         * Disable stream mode so cleanup routine can proceed undisturbed.
         */
        if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE))
-               printk(KERN_WARNING "psmouse.c: Failed to disable mouse on %s\n",
-                       psmouse->ps2dev.serio->phys);
+               psmouse_warn(psmouse, "Failed to disable mouse on %s\n",
+                            psmouse->ps2dev.serio->phys);
 
        if (psmouse->cleanup)
                psmouse->cleanup(psmouse);
@@ -1400,7 +1410,8 @@ static int psmouse_reconnect(struct serio *serio)
        int rc = -1;
 
        if (!drv || !psmouse) {
-               printk(KERN_DEBUG "psmouse: reconnect request, but serio is disconnected, ignoring...\n");
+               psmouse_dbg(psmouse,
+                           "reconnect request, but serio is disconnected, ignoring...\n");
                return -1;
        }
 
@@ -1427,8 +1438,9 @@ static int psmouse_reconnect(struct serio *serio)
                        goto out;
        }
 
-       /* ok, the device type (and capabilities) match the old one,
-        * we can continue using it, complete intialization
+       /*
+        * OK, the device type (and capabilities) match the old one,
+        * we can continue using it, complete initialization
         */
        psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
 
@@ -1586,9 +1598,8 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co
 
        while (!list_empty(&serio->children)) {
                if (++retry > 3) {
-                       printk(KERN_WARNING
-                               "psmouse: failed to destroy children ports, "
-                               "protocol change aborted.\n");
+                       psmouse_warn(psmouse,
+                                    "failed to destroy children ports, protocol change aborted.\n");
                        input_free_device(new_dev);
                        return -EIO;
                }
@@ -1715,7 +1726,7 @@ static int __init psmouse_init(void)
 
        kpsmoused_wq = create_singlethread_workqueue("kpsmoused");
        if (!kpsmoused_wq) {
-               printk(KERN_ERR "psmouse: failed to create kpsmoused workqueue\n");
+               pr_err("failed to create kpsmoused workqueue\n");
                return -ENOMEM;
        }