On 09/29/2011 01:14 PM, JJ Ding wrote:
> From: JJ Ding <dgdunix@xxxxxxxxx>
>
> psmouse.c had long been renamed to psmouse-base.c back in 2003, when we
> were still at Linux 2.5.xx. This change makes the log less misleading.
>
> Signed-off-by: JJ Ding <dgdunix@xxxxxxxxx>
Reviewed-by: Wanlong Gao <gaowanlong@xxxxxxxxxxxxxx>
> ---
> drivers/input/mouse/psmouse-base.c | 22 +++++++++++-----------
> 1 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
> index 3f74bae..6a2584d 100644
> --- a/drivers/input/mouse/psmouse-base.c
> +++ b/drivers/input/mouse/psmouse-base.c
> @@ -251,11 +251,11 @@ 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",
> + printk(KERN_WARNING "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");
> + printk(KERN_NOTICE "psmouse: issuing reconnect request\n");
> serio_reconnect(psmouse->ps2dev.serio);
> return -1;
> }
> @@ -267,7 +267,7 @@ 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",
> + printk(KERN_NOTICE "psmouse: %s at %s - driver resynched.\n",
> psmouse->name, psmouse->phys);
> }
> break;
> @@ -295,7 +295,7 @@ 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",
> + printk(KERN_WARNING "psmouse: bad data from KBC -%s%s\n",
> flags & SERIO_TIMEOUT ? " timeout" : "",
> flags & SERIO_PARITY ? " bad parity" : "");
> ps2_cmd_aborted(&psmouse->ps2dev);
> @@ -315,7 +315,7 @@ 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",
> + printk(KERN_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);
> @@ -943,7 +943,7 @@ 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);
> + printk(KERN_WARNING "psmouse: Failed to reset mouse on %s\n", ps2dev->serio->phys);
>
> return 0;
> }
> @@ -1005,7 +1005,7 @@ 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",
> + printk(KERN_WARNING "psmouse: Failed to enable mouse on %s\n",
> psmouse->ps2dev.serio->phys);
>
> psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
> @@ -1020,7 +1020,7 @@ 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",
> + printk(KERN_WARNING "psmouse: Failed to deactivate mouse on %s\n",
> psmouse->ps2dev.serio->phys);
>
> psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
> @@ -1115,14 +1115,14 @@ static void psmouse_resync(struct work_struct *work)
> }
>
> if (!enabled) {
> - printk(KERN_WARNING "psmouse.c: failed to re-enable mouse on %s\n",
> + printk(KERN_WARNING "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");
> + printk(KERN_INFO "psmouse: resync failed, issuing reconnect request\n");
> serio_reconnect(serio);
> } else
> psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
> @@ -1155,7 +1155,7 @@ 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",
> + printk(KERN_WARNING "psmouse: Failed to disable mouse on %s\n",
> psmouse->ps2dev.serio->phys);
>
> if (psmouse->cleanup)
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
