From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932570AbcHIV4y (ORCPT ); Tue, 9 Aug 2016 17:56:54 -0400 Received: from mail-by2nam03on0048.outbound.protection.outlook.com ([104.47.42.48]:55120 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932338AbcHIV4u (ORCPT ); Tue, 9 Aug 2016 17:56:50 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=nxp.com; From: York Sun To: CC: , , , , York Sun , Doug Thompson , , Subject: [Patch v4 2/9] driver/edac/mpc85xx_edac: Replace printk with proper pr_* format Date: Tue, 9 Aug 2016 14:55:39 -0700 Message-ID: <1470779760-16483-3-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470779760-16483-1-git-send-email-york.sun@nxp.com> References: <1470779760-16483-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131152534070050980;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.158.2;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(54534003)(199003)(104016004)(97736004)(50226002)(105606002)(106466001)(2906002)(68736007)(8936002)(19580405001)(110136002)(19580395003)(69596002)(77096005)(2950100001)(8676002)(81156014)(305945005)(81166006)(189998001)(7846002)(48376002)(8666005)(50466002)(586003)(4326007)(356003)(36756003)(47776003)(87936001)(85426001)(5003940100001)(229853001)(92566002)(2351001)(86362001)(33646002)(575784001)(50986999)(76176999)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB1194;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC006;1:e41Rt0QJ18sfCh92QG3kfJ+4H2HY+1KFRmSdX6ogDDBq/g4nrFhsyRkaoll7PJFIVslcedYNdU6Tj/2qlMXew8cB/Q+DTWDNpmTZEIhRN1YUEMBNEZXgo68gznsk6MhttU+OVciZl+CUK5WL7CRxrAzkrCJKNFY12iBdnITPXxN5hvYR/EeLkLrb1kvBCfCRH424311i/vVi6mWV1+ty2UH7+n8VfRaZ7iDLDlz1WkZZ/pxFZDNMdjnCFU8iJhGIjTv5siQwg1LWxla8ntYUsvnxMDcrSp0jTFDHvn6WBwckilmGDwDCcKzlWqLN4HZrLLQ3aA6eYuUbitnRzrkUUS2EwC466YQDgA2xZc1kEvZzFDzoo/HhmvaMJVZC45b1b2KYjd2Tf8brRmG1SGSnTjzEIeM53GwV56T5vzeg65dMQkO3CYPLSCZZj2IEVESs7ZPrDwi4PNdFC6sQY8r2A3kn28Qhi39Pwv6tVKsCbH8uhI3rh4gxzVp5j07aA2/lDQl1ZaE1SU180NdotGMQY8R7jdErSGLgjI6DEOeC8Mow+vEl9Z+m/CbY+VJrxjZMs67Bdf9QzCUieIb8KcFDkg== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 69dc6029-eed0-4cba-df46-08d3c0a00f17 X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1194;2:cDXwbnFuDGtPPHOZUkIFlXrep4DbO/bUPHn3G7IlcFP6IzKY7Eek99fLfJo8Z/n9t0mkxkOOexvxEwbytFT7z3+k7eb+IQrmQ+RoakATwfg1lOpWcc6Qc3PtxQlKCgXPs5ubs5OxcTraVgoVC2lJ52Q6hx1kjYeCtClzaempY750wleic22j2XP/mXfH/3iB;3:VK0brg1u/+A0QKmYtKilwNUCTtktb0bw0arX+NX5zkqDQiGwWaGnxsrd1H5vUfT+7rPgQLwkCpLuMfkKJFtUB3ue94fhRMrl6Azq1rxw9xw2wpsmUeV7vPw5UFxWGodYm/hGBfjR3GUEIbXL+MYvAtKN+jBEZqT0C/xXyVFpjuWp5YhTRRCpL8PVWO6n481w3+WYU6kInSFLoKPyoWxgJDducs/cf+VwlQSJGNAfewk= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1194; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1194;25:7cT0W8AgPIkWB6n/ncN+cidB+1XH/v1SHLcFitSqWdjObXisY7WwQBS8eD+HAilaGEekdLVI6ON5QLoCVAdnZF1kP/M7rRlRX8ZTNo+k4Cne89CSuAnElwdl5eQqg5RFHOST6ZUYhp9Uo3eLs4d5x/haG4sL/xnCQ6zFgTM8A3EubCXh4yomGUNgud0un6uM1/r+Wr+flO/dra5j94DYUiMQzhCzPgzK27j/tYgz2OolFRh7cnE+OXbA1l4N4V3ZgLe65ZnJyX1eVjiLki5viiGpKLrBFhsJFtM1KfnYNmH3td5FnupcJe/qN5TwRSTTt36qCkEr5pRnaLNqB3KQQb1L4uAYRBhxGvn2an/LzNVSRHwargJCiiWXiPo0L8IN+sL44Wkjzq8KFSsCLecTtMEg81hrl8D6qlgT9T0ZfpBHIb/4U0b0/72qhwbs8OXvL9r3aUT493GouLBMDTOXpWD2mv/HKK+YRFuXCCbzU5THjUY3TwWAKP9PDY3kc3/lnaiFyD00IAZEqI5ZLCkNUOTR8EtPIb8V4qnIY/y3MxxGYnKGwb3s9suSCMSPG+w+MCY4MetqUMtGvCf3Dp0170Ju4uKrd2YspcR004j0l2EpP60ntJaW0ePkscfzjopgzu8GMxnIwD0dTR6EGuF3BJSOaVZMj5nZdWa3HTfJX2FiZmcT1xVLUp4KrPu/3k6c+/5UUzbuvJEvl/p7O96CwA==;31:ZQEI4RPijMZKnqewe5vj4F42CV/WxChOdKDzYy4v8p5veYVQoxfCkzHu+WnOVU8+AUcEUvZXG30cqbtnOV7XZqPnpAPf2rzpCstSC3X8PmDKhh7BW6vzL8ui113Kmd7p1IkXNbD5WXtx8W8qZMHfsd1V4D0bL6rQF0EQ3QNmRoYUgiIeURC6ImOwdPj36BpXUMC71L2mIxXTFJUYZLVPSkuiRPRnO4lF55Si1O/ahuw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(788757137089)(211171220733660); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13023025)(13024025)(13015025)(13018025)(13017025)(8121501046)(5005006)(10201501046)(3002001)(6055026);SRVR:CY1PR0301MB1194;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR0301MB1194; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1194;4:EkAPQAlOxmOC/fM4WkCAu6zKvxwioxmpmNb+0iqYEPzNWfDA9SP0SNQCsQicytCjAMYUbr23sUO6/kFeu+c7vpCdqF2UO8n7iPLgJri3Mfc11WMq9hjlYhmlpd7PP+hSwDkipP3h4Aqa3tO3ZqKlwxJxdVUl8mzCn9+7/q8D4wfGkQyB5T2t0XPZqWPKmK0Srij13k0XG5vdzVaU3MRtIE8qfcC/+tUSSfsDF4bbwLLGHhXy1S6rSG4b5p1p+sdvh0sfg1PgifI91krza4nkFJNhH6LHUcIQoK6CHd0+qY1KTYDLxN+vUvLPvgtwMjm07NZc5whmC17zlMfoxhwFkn/sG3f88vTF3qhxC2oYdnMgrgGYL//6CBsRQv0JWBVaFmhpX+pp/mRpJbvg9tKdBujlsfliAPbaqKpVVuW53qeqeaePDMJg+bkAJMZA0Ib3aNEQhZCXJ2fsBf5mgwp6lDWgtH0UpahGJRI205217+FhdbMF2GXtduxH0eX1oLLjLSps7szZfHWraF4QgNqvOpvxjglmxTZsXkak3eo17nTb+bzsXziG/tuzW9EWcVCQ1aCgoAQ4Ke4hSVll6iJVVA== X-Forefront-PRVS: 0029F17A3F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB1194;23:tar4e7xLp4V/GgUwIw02aT2/utBdiy/kcj2v2En?= =?us-ascii?Q?BisS/+OcbpAENTrxsjRg1rqEBHq11P7bsy0X0lgP5F+fbXd3oSv9k/IcXrpL?= =?us-ascii?Q?Uud5NJoQWDoNxPkkeypoJzmvnt+Hj0nGKQeDmJfoj/fTApwFoltsoAOh+OyQ?= =?us-ascii?Q?gpp3CuwLn4D0NlBOrDtkwd0dLZ+wemoFeLSz4v4VVI0GDdbRjjh9HvdA6hDR?= =?us-ascii?Q?E1bA1vSpBzLSe3oZJp3Lhpnsqu6KzT0xfejLve3igEiotAz+ZamZLSDgDXVt?= =?us-ascii?Q?TZjs9NvC2Zm/tY/8/6lP32NnjSQPzkaup3w2vfPDnb9OOar03ms/72mJ92f+?= =?us-ascii?Q?yOEQv+sj2sR8zdnY/px3V61G2RqtkIRKX++jliLWLAl3HJfbGlFqyxbHYD6U?= =?us-ascii?Q?jzeU/tEDBQOpyf9g/pG/dCKW1l2pGFmBRZNMLdy7iPBZu71e6ATrTDgpzmxl?= =?us-ascii?Q?6BmaZYNBQPNSozpV5cxWVNDF/BDXnerHPfiCNy7ret+zhO85SwsbmgNTFtow?= =?us-ascii?Q?HbloU7SsZj19rUnmPjnbb2c8IxtD9qWxIbblt+WI7o9FGaW+8+iAHidgi/hi?= =?us-ascii?Q?CA7qLF3BVd0dwKNNoCGvtIsc9SQMl/DLfpIBSd4/izhwsrqok2EdJ9XckGNx?= =?us-ascii?Q?cinTBXFyUhlNasCpWPZQ5LgAUxyhItugoEtUC1RQhCt5himm6Nt7qJYYUigB?= =?us-ascii?Q?ke5gJx3fQRiUXt2SKrImTnXrVqBTlZzgXubRoSUxUuFVdiYjSkGSBfe+E0is?= =?us-ascii?Q?3vq5Wq1rdFV/j9xIyaOQIX/UcIDAoIMa+90SY+215ST8r/buhiG/2a0zT/lG?= =?us-ascii?Q?CR5t3syid8M7aDvHsg8tn56R5/YjHf1sS3XqfI1R2HHsVLF0JIVya5OLoSQ1?= =?us-ascii?Q?zyVmzdO5Rbr5dFu/HubKiIE4qhP4NjX8V7pgPyV5eLqBEcfnd/RgJ+GMPYPd?= =?us-ascii?Q?bmITki2HDBgr80kvUXH+w36trjaRAFcOPX0dYWGDAWhIZn/1n7wRDBPr8DiY?= =?us-ascii?Q?YqUXfxu4NA3qGHOac2vcCB8vtsIFIa+nzJl0c7AFJaTYN+pOcdF1h3bTluSO?= =?us-ascii?Q?jsqqRTL/S1gQvrNtavgOhZWcWDr1UuGTE+ziDA0zzfADaPrDP52oiNEo4CE+?= =?us-ascii?Q?t23wDbrzOXT6LfW2OappF1zTRCk+eJivPjELuujfldP2DT8k5S0eZY0yj0pR?= =?us-ascii?Q?xcQA2AeXkE84nUj8=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1194;6:HxWqZg66VBMvtW1wHEvu/qEkQbFMLxr/v2jdzmLZDx3tv0C71XzUBpZDgUaRDur6HUBqTwn9ajOGOm+Sd66m8Hded7STKTOhattRQVSLZytIXVQFoX8tz8r+gDLMf6r/mbZCVx2s5oyG6C6gv42LTUNP+HMQfoEpMJFbbf5OuLUftVxQqvjct615cJHpPWrLM5nmNjYmc8KOQlXghLGduX7dsJu/5XWGbpvwEHe4JvtHv+XOgAoO/uQBXyUNTnh5v85xYJeKcZvk/AYsa7f8DBc5VqMXkihCbtNw+vR+B48=;5:jABxKEYKCFul7NBR5Lif/JwPoYnc78MXtFy5ziErrisoUezZ+Knjrf6UZks5zS56z3ghmXPLJQ93/XriuP4OaKo1/kQSaKqy5FiEmwhluh9O1TP9up9mkwqh0286gSbPl0LoCWDeEmQNs0fzHzwcnf/1m5f2CmvX1HHcKL7dHG4=;24:92Gf3NHF9s+JdYUmIQoTko2cU4VHwenThR8JnoOM4dCb5ujffIAFbpF5APabrWapxSgMaMmx/eO5CxSPSEHL3FcCrf5wm7TMSSaGmUOoYr4=;7:av5YE6GrNPiUfak6S+KPt3wzFuIgHYWsaz4qvtN1t/WayjavhYnjDauucOJNq3lTE/U4OFo78Wfv/6bcM55LL6HCHhAXfh5b8jKs2/QVbKTDD8pxPdoiJ8jt0wluSTr9nwJA4jxVsxjbCH0g/7fu6xR+xLgLzBmQRYrV4Wo0ohsJQEHrE0Hfpimv+dqkEtPxYJYdnvPvlNfePk3ikkk2Iieox2d6pUxdjslXVh2IBeYwOUJqZteVqo37TyY9GMXI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 21:56:46.7867 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1194 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace printk with more preferred pr_err/pr_warn/pr_info format. Signed-off-by: York Sun --- Change log v4: no change v3: no change v2: Reordered patch. Change more printk statement than v1 patch. drivers/edac/mpc85xx_edac.c | 72 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index fdc3d9b..c0b0951 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -157,18 +157,18 @@ static void mpc85xx_pci_check(struct edac_pci_ctl_info *pci) return; } - printk(KERN_ERR "PCI error(s) detected\n"); - printk(KERN_ERR "PCI/X ERR_DR register: %#08x\n", err_detect); + pr_err("PCI error(s) detected\n"); + pr_err("PCI/X ERR_DR register: %#08x\n", err_detect); - printk(KERN_ERR "PCI/X ERR_ATTRIB register: %#08x\n", + pr_err("PCI/X ERR_ATTRIB register: %#08x\n", in_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_ATTRIB)); - printk(KERN_ERR "PCI/X ERR_ADDR register: %#08x\n", + pr_err("PCI/X ERR_ADDR register: %#08x\n", in_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_ADDR)); - printk(KERN_ERR "PCI/X ERR_EXT_ADDR register: %#08x\n", + pr_err("PCI/X ERR_EXT_ADDR register: %#08x\n", in_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_EXT_ADDR)); - printk(KERN_ERR "PCI/X ERR_DL register: %#08x\n", + pr_err("PCI/X ERR_DL register: %#08x\n", in_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_DL)); - printk(KERN_ERR "PCI/X ERR_DH register: %#08x\n", + pr_err("PCI/X ERR_DH register: %#08x\n", in_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_DH)); /* clear error bits */ @@ -294,7 +294,7 @@ static int mpc85xx_pci_err_probe(struct platform_device *op) res = of_address_to_resource(of_node, 0, &r); if (res) { - printk(KERN_ERR "%s: Unable to get resource for " + pr_err("%s: Unable to get resource for " "PCI err regs\n", __func__); goto err; } @@ -304,7 +304,7 @@ static int mpc85xx_pci_err_probe(struct platform_device *op) if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r), pdata->name)) { - printk(KERN_ERR "%s: Error while requesting mem region\n", + pr_err("%s: Error while requesting mem region\n", __func__); res = -EBUSY; goto err; @@ -312,7 +312,7 @@ static int mpc85xx_pci_err_probe(struct platform_device *op) pdata->pci_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r)); if (!pdata->pci_vbase) { - printk(KERN_ERR "%s: Unable to setup PCI err regs\n", __func__); + pr_err("%s: Unable to setup PCI err regs\n", __func__); res = -ENOMEM; goto err; } @@ -353,15 +353,14 @@ static int mpc85xx_pci_err_probe(struct platform_device *op) IRQF_SHARED, "[EDAC] PCI err", pci); if (res < 0) { - printk(KERN_ERR - "%s: Unable to request irq %d for " + pr_err("%s: Unable to request irq %d for " "MPC85xx PCI err\n", __func__, pdata->irq); irq_dispose_mapping(pdata->irq); res = -ENODEV; goto err2; } - printk(KERN_INFO EDAC_MOD_STR " acquired irq %d for PCI Err\n", + pr_info(EDAC_MOD_STR " acquired irq %d for PCI Err\n", pdata->irq); } @@ -383,7 +382,7 @@ static int mpc85xx_pci_err_probe(struct platform_device *op) devres_remove_group(&op->dev, mpc85xx_pci_err_probe); edac_dbg(3, "success\n"); - printk(KERN_INFO EDAC_MOD_STR " PCI err registered\n"); + pr_info(EDAC_MOD_STR " PCI err registered\n"); return 0; @@ -526,17 +525,17 @@ static void mpc85xx_l2_check(struct edac_device_ctl_info *edac_dev) if (!(err_detect & L2_EDE_MASK)) return; - printk(KERN_ERR "ECC Error in CPU L2 cache\n"); - printk(KERN_ERR "L2 Error Detect Register: 0x%08x\n", err_detect); - printk(KERN_ERR "L2 Error Capture Data High Register: 0x%08x\n", + pr_err("ECC Error in CPU L2 cache\n"); + pr_err("L2 Error Detect Register: 0x%08x\n", err_detect); + pr_err("L2 Error Capture Data High Register: 0x%08x\n", in_be32(pdata->l2_vbase + MPC85XX_L2_CAPTDATAHI)); - printk(KERN_ERR "L2 Error Capture Data Lo Register: 0x%08x\n", + pr_err("L2 Error Capture Data Lo Register: 0x%08x\n", in_be32(pdata->l2_vbase + MPC85XX_L2_CAPTDATALO)); - printk(KERN_ERR "L2 Error Syndrome Register: 0x%08x\n", + pr_err("L2 Error Syndrome Register: 0x%08x\n", in_be32(pdata->l2_vbase + MPC85XX_L2_CAPTECC)); - printk(KERN_ERR "L2 Error Attributes Capture Register: 0x%08x\n", + pr_err("L2 Error Attributes Capture Register: 0x%08x\n", in_be32(pdata->l2_vbase + MPC85XX_L2_ERRATTR)); - printk(KERN_ERR "L2 Error Address Capture Register: 0x%08x\n", + pr_err("L2 Error Address Capture Register: 0x%08x\n", in_be32(pdata->l2_vbase + MPC85XX_L2_ERRADDR)); /* clear error detect register */ @@ -593,7 +592,7 @@ static int mpc85xx_l2_err_probe(struct platform_device *op) res = of_address_to_resource(op->dev.of_node, 0, &r); if (res) { - printk(KERN_ERR "%s: Unable to get resource for " + pr_err("%s: Unable to get resource for " "L2 err regs\n", __func__); goto err; } @@ -603,7 +602,7 @@ static int mpc85xx_l2_err_probe(struct platform_device *op) if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r), pdata->name)) { - printk(KERN_ERR "%s: Error while requesting mem region\n", + pr_err("%s: Error while requesting mem region\n", __func__); res = -EBUSY; goto err; @@ -611,7 +610,7 @@ static int mpc85xx_l2_err_probe(struct platform_device *op) pdata->l2_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r)); if (!pdata->l2_vbase) { - printk(KERN_ERR "%s: Unable to setup L2 err regs\n", __func__); + pr_err("%s: Unable to setup L2 err regs\n", __func__); res = -ENOMEM; goto err; } @@ -643,15 +642,14 @@ static int mpc85xx_l2_err_probe(struct platform_device *op) mpc85xx_l2_isr, IRQF_SHARED, "[EDAC] L2 err", edac_dev); if (res < 0) { - printk(KERN_ERR - "%s: Unable to request irq %d for " + pr_err("%s: Unable to request irq %d for " "MPC85xx L2 err\n", __func__, pdata->irq); irq_dispose_mapping(pdata->irq); res = -ENODEV; goto err2; } - printk(KERN_INFO EDAC_MOD_STR " acquired irq %d for L2 Err\n", + pr_info(EDAC_MOD_STR " acquired irq %d for L2 Err\n", pdata->irq); edac_dev->op_state = OP_RUNNING_INTERRUPT; @@ -662,7 +660,7 @@ static int mpc85xx_l2_err_probe(struct platform_device *op) devres_remove_group(&op->dev, mpc85xx_l2_err_probe); edac_dbg(3, "success\n"); - printk(KERN_INFO EDAC_MOD_STR " L2 err registered\n"); + pr_info(EDAC_MOD_STR " L2 err registered\n"); return 0; @@ -1064,14 +1062,14 @@ static int mpc85xx_mc_err_probe(struct platform_device *op) res = of_address_to_resource(op->dev.of_node, 0, &r); if (res) { - printk(KERN_ERR "%s: Unable to get resource for MC err regs\n", + pr_err("%s: Unable to get resource for MC err regs\n", __func__); goto err; } if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r), pdata->name)) { - printk(KERN_ERR "%s: Error while requesting mem region\n", + pr_err("%s: Error while requesting mem region\n", __func__); res = -EBUSY; goto err; @@ -1079,7 +1077,7 @@ static int mpc85xx_mc_err_probe(struct platform_device *op) pdata->mc_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r)); if (!pdata->mc_vbase) { - printk(KERN_ERR "%s: Unable to setup MC err regs\n", __func__); + pr_err("%s: Unable to setup MC err regs\n", __func__); res = -ENOMEM; goto err; } @@ -1087,7 +1085,7 @@ static int mpc85xx_mc_err_probe(struct platform_device *op) sdram_ctl = in_be32(pdata->mc_vbase + MPC85XX_MC_DDR_SDRAM_CFG); if (!(sdram_ctl & DSC_ECC_EN)) { /* no ECC */ - printk(KERN_WARNING "%s: No ECC DIMMs discovered\n", __func__); + pr_warn("%s: No ECC DIMMs discovered\n", __func__); res = -ENODEV; goto err; } @@ -1140,20 +1138,20 @@ static int mpc85xx_mc_err_probe(struct platform_device *op) IRQF_SHARED, "[EDAC] MC err", mci); if (res < 0) { - printk(KERN_ERR "%s: Unable to request irq %d for " + pr_err("%s: Unable to request irq %d for " "MPC85xx DRAM ERR\n", __func__, pdata->irq); irq_dispose_mapping(pdata->irq); res = -ENODEV; goto err2; } - printk(KERN_INFO EDAC_MOD_STR " acquired irq %d for MC\n", + pr_info(EDAC_MOD_STR " acquired irq %d for MC\n", pdata->irq); } devres_remove_group(&op->dev, mpc85xx_mc_err_probe); edac_dbg(3, "success\n"); - printk(KERN_INFO EDAC_MOD_STR " MC err registered\n"); + pr_info(EDAC_MOD_STR " MC err registered\n"); return 0; @@ -1235,7 +1233,7 @@ static int __init mpc85xx_mc_init(void) int res = 0; u32 __maybe_unused pvr = 0; - printk(KERN_INFO "Freescale(R) MPC85xx EDAC driver, " + pr_info("Freescale(R) MPC85xx EDAC driver, " "(C) 2006 Montavista Software\n"); /* make sure error reporting method is sane */ @@ -1250,7 +1248,7 @@ static int __init mpc85xx_mc_init(void) res = platform_register_drivers(drivers, ARRAY_SIZE(drivers)); if (res) - printk(KERN_WARNING EDAC_MOD_STR "drivers fail to register\n"); + pr_warn(EDAC_MOD_STR "drivers fail to register\n"); return 0; } -- 2.7.4