From patchwork Wed Oct 27 07:16:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: KOBAYASHI Yoshitake X-Patchwork-Id: 284912 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9R7kRxM008059 for ; Wed, 27 Oct 2010 07:46:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754894Ab0J0HqE (ORCPT ); Wed, 27 Oct 2010 03:46:04 -0400 Received: from imx9.toshiba.co.jp ([202.33.96.51]:44478 "EHLO imx9.toshiba.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752629Ab0J0HqD (ORCPT ); Wed, 27 Oct 2010 03:46:03 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 27 Oct 2010 07:46:28 +0000 (UTC) X-Greylist: delayed 1398 seconds by postgrey-1.27 at vger.kernel.org; Wed, 27 Oct 2010 03:46:03 EDT Received: from imx12.toshiba.co.jp (imx12 [61.202.160.132]) by imx9.toshiba.co.jp with ESMTP id o9R7MgWN001089 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 27 Oct 2010 16:22:42 +0900 (JST) Received: from arc11.toshiba.co.jp ([133.199.90.127]) by imx12.toshiba.co.jp with ESMTP id o9R7Gc9Z011034; Wed, 27 Oct 2010 16:16:38 +0900 (JST) Received: (from root@localhost) by arc11.toshiba.co.jp id o9R7Gch5020452; Wed, 27 Oct 2010 16:16:38 +0900 (JST) Received: from ovp11.toshiba.co.jp [133.199.90.148] by arc11.toshiba.co.jp with ESMTP id SAA20450; Wed, 27 Oct 2010 16:16:38 +0900 Received: from mx12.toshiba.co.jp (localhost [127.0.0.1]) by ovp11.toshiba.co.jp with ESMTP id o9R7Gb28018234; Wed, 27 Oct 2010 16:16:37 +0900 (JST) Received: from BK2211.rdc.toshiba.co.jp by toshiba.co.jp id o9R7GW3n015356; Wed, 27 Oct 2010 16:16:32 +0900 (JST) Received: from island.swc.toshiba.co.jp (localhost [127.0.0.1]) by BK2211.rdc.toshiba.co.jp (8.13.8+Sun/8.13.8) with ESMTP id o9R7GWB0021752; Wed, 27 Oct 2010 16:16:32 +0900 (JST) Received: from [133.199.17.36] (ivpn-2-36.mobile.toshiba.co.jp [133.199.17.36]) by island.swc.toshiba.co.jp (Postfix) with ESMTP id BA01D40003; Wed, 27 Oct 2010 16:16:30 +0900 (JST) Message-ID: <4CC7D1CC.8090008@toshiba.co.jp> Date: Wed, 27 Oct 2010 08:16:28 +0100 From: KOBAYASHI Yoshitake User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.8) Gecko/20100802 Lightning/1.0b2 Thunderbird/3.1.2 MIME-Version: 1.0 To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drivers/in, put/mouse/psmouse-base.c: fix messages to point to existing file X-Enigmail-Version: 1.1.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 73a7af2..ecc476d 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -251,11 +251,13 @@ 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-base.c: %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-base.c: issuing reconnect request\n"); serio_reconnect(psmouse->ps2dev.serio); return -1; } @@ -267,7 +269,8 @@ 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-base.c: %s at %s - driver resynched.\n", psmouse->name, psmouse->phys); } break; @@ -295,7 +298,8 @@ 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-base.c: bad data from KBC -%s%s\n", flags & SERIO_TIMEOUT ? " timeout" : "", flags & SERIO_PARITY ? " bad parity" : ""); ps2_cmd_aborted(&psmouse->ps2dev); @@ -315,8 +319,9 @@ 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); + printk(KERN_INFO + "psmouse-base.c: %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 +948,9 @@ 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-base.c: Failed to reset mouse on %s\n", + ps2dev->serio->phys); return 0; } @@ -1005,7 +1012,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", + printk(KERN_WARNING + "psmouse-base.c: Failed to enable mouse on %s\n", psmouse->ps2dev.serio->phys); psmouse_set_state(psmouse, PSMOUSE_ACTIVATED); @@ -1020,7 +1028,8 @@ 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-base.c: Failed to deactivate mouse on %s\n", psmouse->ps2dev.serio->phys); psmouse_set_state(psmouse, PSMOUSE_CMD_MODE); @@ -1115,14 +1124,16 @@ 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-base.c: 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-base.c: resync failed, issuing reconnect request\n"); serio_reconnect(serio); } else psmouse_set_state(psmouse, PSMOUSE_ACTIVATED); @@ -1155,7 +1166,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", + printk(KERN_WARNING + "psmouse-base.c: Failed to disable mouse on %s\n", psmouse->ps2dev.serio->phys); if (psmouse->cleanup)