From patchwork Wed Oct 29 10:45:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 404561 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 08A8614008B for ; Wed, 29 Oct 2014 23:24:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932774AbaJ2MY0 (ORCPT ); Wed, 29 Oct 2014 08:24:26 -0400 Received: from mail-bn1bbn0104.outbound.protection.outlook.com ([157.56.111.104]:52672 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932585AbaJ2MYZ (ORCPT ); Wed, 29 Oct 2014 08:24:25 -0400 X-Greylist: delayed 1090 seconds by postgrey-1.27 at vger.kernel.org; Wed, 29 Oct 2014 08:24:24 EDT Received: from DM2PR03MB336.namprd03.prod.outlook.com (10.141.54.25) by DM2PR03MB335.namprd03.prod.outlook.com (10.141.54.20) with Microsoft SMTP Server (TLS) id 15.1.11.9; Wed, 29 Oct 2014 11:51:40 +0000 Received: from BY2PR03CA070.namprd03.prod.outlook.com (10.141.249.43) by DM2PR03MB336.namprd03.prod.outlook.com (10.141.54.25) with Microsoft SMTP Server (TLS) id 15.1.11.9; Wed, 29 Oct 2014 11:51:38 +0000 Received: from BN1AFFO11FD005.protection.gbl (2a01:111:f400:7c10::124) by BY2PR03CA070.outlook.office365.com (2a01:111:e400:2c5d::43) with Microsoft SMTP Server (TLS) id 15.1.6.9 via Frontend Transport; Wed, 29 Oct 2014 11:51:37 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD005.mail.protection.outlook.com (10.58.52.65) with Microsoft SMTP Server (TLS) id 15.0.1049.20 via Frontend Transport; Wed, 29 Oct 2014 11:51:36 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s9TBpOFL024329; Wed, 29 Oct 2014 04:51:31 -0700 From: Dong Aisheng To: CC: , , , , , , Subject: [PATCH 2/7] can: m_can: fix the incorrect error messages Date: Wed, 29 Oct 2014 18:45:22 +0800 Message-ID: <1414579527-31100-2-git-send-email-b29396@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414579527-31100-1-git-send-email-b29396@freescale.com> References: <1414579527-31100-1-git-send-email-b29396@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(89996001)(104166001)(50226001)(62966002)(88136002)(21056001)(87286001)(97736003)(87936001)(64706001)(31966008)(106466001)(33646002)(36756003)(95666004)(107046002)(104016003)(229853001)(6806004)(85852003)(4396001)(2351001)(77156001)(105606002)(44976005)(92566001)(19580405001)(50466002)(92726001)(93916002)(68736004)(48376002)(20776003)(47776003)(26826002)(110136001)(84676001)(46102003)(80022003)(76176999)(120916001)(102836001)(85306004)(19580395003)(76482002)(50986999)(99396003)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB336; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:;UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB336; X-Forefront-PRVS: 03793408BA Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=Aisheng.Dong@freescale.com; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB335; X-OriginatorOrg: freescale.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix a few error messages. Signed-off-by: Dong Aisheng --- drivers/net/can/m_can/m_can.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 8692848..2784423 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -606,14 +606,14 @@ static int m_can_handle_state_errors(struct net_device *dev, u32 psr) if ((psr & PSR_EP) && (priv->can.state != CAN_STATE_ERROR_PASSIVE)) { - netdev_dbg(dev, "entered error warning state\n"); + netdev_dbg(dev, "entered error passive state\n"); work_done += m_can_handle_state_change(dev, CAN_STATE_ERROR_PASSIVE); } if ((psr & PSR_BO) && (priv->can.state != CAN_STATE_BUS_OFF)) { - netdev_dbg(dev, "entered error warning state\n"); + netdev_dbg(dev, "entered error bus off state\n"); work_done += m_can_handle_state_change(dev, CAN_STATE_BUS_OFF); } @@ -625,7 +625,7 @@ static void m_can_handle_other_err(struct net_device *dev, u32 irqstatus) { if (irqstatus & IR_WDI) netdev_err(dev, "Message RAM Watchdog event due to missing READY\n"); - if (irqstatus & IR_BEU) + if (irqstatus & IR_ELO) netdev_err(dev, "Error Logging Overflow\n"); if (irqstatus & IR_BEU) netdev_err(dev, "Bit Error Uncorrected\n");