From patchwork Tue Oct 4 07:32:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 677945 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sp9lQ1NMTz9ryn for ; Tue, 4 Oct 2016 18:38:58 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sp9lQ0dMRzDt0p for ; Tue, 4 Oct 2016 18:38:58 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0055.outbound.protection.outlook.com [104.47.38.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sp9cp2LmszDsjl for ; Tue, 4 Oct 2016 18:33:14 +1100 (AEDT) Received: from DM5PR03CA0022.namprd03.prod.outlook.com (10.175.104.32) by BLUPR0301MB2001.namprd03.prod.outlook.com (10.164.22.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16; Tue, 4 Oct 2016 07:33:10 +0000 Received: from BN1AFFO11FD050.protection.gbl (2a01:111:f400:7c10::119) by DM5PR03CA0022.outlook.office365.com (2603:10b6:3:118::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Tue, 4 Oct 2016 07:33:09 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD050.mail.protection.outlook.com (10.58.53.65) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Tue, 4 Oct 2016 07:33:07 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u947WxJ0022632; Tue, 4 Oct 2016 00:33:04 -0700 From: Madalin Bucur To: Subject: [net-next 03/13] fsl/fman: small fixes Date: Tue, 4 Oct 2016 10:32:49 +0300 Message-ID: <1475566379-5078-4-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1475566379-5078-1-git-send-email-madalin.bucur@nxp.com> References: <1475566379-5078-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131200399893334147; (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)(1109001)(1110001)(339900001)(199003)(189002)(626004)(2351001)(97736004)(81156014)(69596002)(229853001)(189998001)(8936002)(106466001)(81166006)(43066003)(86362001)(3450700001)(105606002)(48376002)(76176999)(19580405001)(50986999)(50466002)(19580395003)(2906002)(53806999)(85426001)(8676002)(104016004)(356003)(68736007)(305945005)(6916009)(6666003)(5003940100001)(47776003)(586003)(110136003)(36756003)(2950100002)(4720700002)(87936001)(33646002)(5660300001)(4326007)(77096005)(50226002)(7846002); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0301MB2001; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD050; 1:wtM1oIKw/5RLFNS/O2VgKX8SmNYRIKs40VEWX53t68jOmnUGJWZuRDMKLVSN2oy3NfCJwKxpC9LoXp6a2qH9Rw7TrU3gvHJUAyFaveSfWxtHK4IJv8xuqolNMib9c/AtgNoRnQPF9eA/XFvx9grmqSQlQmD77zFmLtWdCRr9RrarlK9+d+ZDc2/JDPzIfdFz9vcINevLgaN7FOGmnxirFldKxzE5mi3taow6tYGrCojkf8yI1Fce2AJL59kVP/GLE9pBsq3r6PonZgWOOrLZDmp+9QHlEeGBiWpmVNVwWGk+3PorhWnEAKaI4xzXxew2uHRNGVyNlZOqbXQtrZ7tFUEyz8aEc0r94CLRN8EcNcOamqKnNpLy20dd86CfVU74Y+YyPyifIWoWZ+QUyj5tv2Nstgmt9EqSUEzrXuKgjhI2RQYpZXOj4gDIyJv8v8J9aG2TGGTRXR4bm7wjAKWx6boOKeqDsvKCJ9FqwyZHYsmEB0tbovI3TAp70TkBcUgTeqw7net+ZN+T7gFM4Q4ZjkDi4zfWiboqW5O0W/IoMLnfxvHGhnaTVaSaOVXnRKVASsibt5GlamTcPxju2ZV0E99+qJtkoDhEZuIvcCI8bdgioz+R9S/fC0VhqTfGKj5c MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 53c462ae-db55-4659-a724-08d3ec28b07c X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2001; 2:vUTCr81it7IgML2xOv3KKXDhKxNbNilNLLEgm1YN7/ew3GQ3Mslqw09spaUtQYb7MFojxyh4h8FxqEPuNh32nTfJsQu/aP3kFnhh7ZgsLYEBc0OKh3ZBfS7j1wwyNik7/qP5jxqDtnPf5/R/X1Na7teudQ8zv7QGrvx38hkeJ0JFH5rDov7SK1HrxIGak4MpyXb4AavNJycWTdkgwdUerA==; 3:yTcGpp8b5cHYmrXHg5N4wG2tDnFPTXp8VnaTRKwtmVeShZt47gPcQWwJWYqNOf+779tivV5fo3Avllev8f0NiX7UX/VHNsku9/Iys3tBo1rguSjRJSPnECbDAmwM8Blqq3O5P/4actpvqSNPxjML7TzXQSmGGY+tOnz0TiD+DI/O83YPWYE3sLdy9hlTF5x69B2k59W2Mim4WQsYz9TdJpF5TNQtZ4nVvEFiic3dX6c0jzC06wmx2cwunUcOtgcC X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB2001; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2001; 25:D0BeXaWbKlvlovCWW1/0efgEGRZrj4MIz1vPbmaCpKFQNfoA9ItQMMFdIFqcvVW2wTKKaivtWAoix5V5yvccaqy3Tr4PKruDHNc5NPHG8xCfiHzjyxyfI283JdXmQ1tHj51wZ1vJiJG8tH8/yyqKJc2718Nfu5bPu1ndHbf57mZCRAlRGeqo8rUq4GsvSnTvybDACTY4wrAuELrC4ojvALX0t42M1/3JhkdF9C3oG/KOUsyaTfedNxXdodvaF/eIKuJLoBC+/thGfimMaNQc8gEKe63YTLbv9qMU36IBqHvGyWECq2cOWMMrsHfJCBzQpj9FXaVsy1Az73WGBPzWLdQAu4QcQD4LrNLmoGA+dSnyi6DgVyij93k3maN9PmPxzHKc0e/dpEoKCydUqInc5PYQhYwm8Ap5fODJKGKTPqDK55L2N4cszK0TXf0EGRBBbbgWvBE5uJjVuIL2s98kI4HQzGsi2W4PNdGXb6gn7iv9oVu+KKK5Ymfd1E0ewA+1xoX5Mm12ESdwJN7/dwgrlc4BksxvnqaeZa+j/PWJlCjpX/viCDn/8Q5wLsXLT/HZIe+tZ0Su9251/KMIX2ijfLfaFiwr4HWEgg3qefyRc4BchmVuz5ryvLdDcUL3VsOHJfYzpdFyoCE4DyIDt6lBEWN6DcqvbWxzfCFYFwSx0sSnSiP9MfdfByLez43XCMcfQAlMWlWGn11sdXKKg15yGVGpLjHuXYyy5M3fWO9peIs= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2001; 31:rE2eCunl0KO1yu66rtGGGcQ84q3JzQNbyyA06JnW+wPOBvbhy8czjnBxFcaGDYcXaQKOGrha2le67+Z4XWaX7p9ryANJz7JwSQtxXA1f+uH26ZOF2TG+WK8OaUdTUX0hrG0loxrLAXcOMvBGOtVZqPiMBMDBlKOeMrRpL+zhvlaluWs37edqNVKCNAYn/YgoToBlsgHaxtSB7Y3qFNouSayQPBGet4JgYHdUBOXLH8fqb9IoGo04uhZVE7/vUpy092GRZbv+OpOVHoi19S2bOeAehAaJG9+Bb8L6GruCIvw=; 4:WzmwbCnqqLTayN+aP20PqtPQCmgCm25mG/TT2rlF9+dgc7Css/B44miBwwVEohu0bbMkpNNUK8XL9ZhRfvS2ow25CRfxBuW2XLgH6/tnuM9c33yLPc29gIq5eZxC6H7yZHpcDCHM1mZ9ntDiBcOo7xZ9cmfekzgRg80z8/T8EfWdH7ZXqSw/WznzslzG7u3MiwadDzPM6g0e/ujmXPuZdHRgiZelsqEAHqpxXypqVaYY3Q3jDO/47h2maTwX0Ek0KUrsQ5RuXqlm3Z7PtpuEo1sYMzqcAEr7flNPH66c72SHwkZjFZblyZ1QQaXRVrtjxwncBCfbOur453OUy6FzNkQDVxwG3/bDmcUNHuXOrMm7T2iuQw9s3BsMGrlI/q0my8PLfXa/0MnXLB5egLHyCkokAwMoode7O2754HCkA2cl8t9NOHWgvKFGA9ZoRyfv8aPKCqt+rvp1UZ+lJtPH4yLXjfKclepTR6Pe7W5zXdS8fEMPRbar0Ws+1n8dMhvFM31TjpBl66kjI4q/3Qe8RlNSurlBt+MSaLDBty7tBsikbvoJdOxoUBGcDn6J/uBf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13023025)(5005006)(8121501046)(13015025)(13017025)(13024025)(13018025)(3002001)(10201501046)(6055026); SRVR:BLUPR0301MB2001; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR0301MB2001; X-Forefront-PRVS: 00851CA28B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0301MB2001; 23:Bs/tV/EuXLDVFjxvp9NdlkwGkqW00cUhR4RDZzG?= =?us-ascii?Q?ttT1MXlpugbl/aX2du10xPofUurw1bgOMNMciKIbAMhcfr+pamKcF6uZk//T?= =?us-ascii?Q?eoEKdB7tX5UrH7nGPVb0D6ccKzagVxbwBQ8ajnZjICyE9Wg2EbBmDjq51fpl?= =?us-ascii?Q?zhn3r9526FTKpjRywxziNT4F5I3DmHhuP/Mw7h1iybkKn8wklgC954SRijE5?= =?us-ascii?Q?JGJGECfk2TODUy8ffzgmjrkApIvhz/yW3IcWjFv71v7YoWxBykZXvz4uXq5i?= =?us-ascii?Q?MnewKN8wOTanU/b5pNgdJRDrB1G7q0qX0iqEoRf3rFQz21lIHBpm1A3l0HIB?= =?us-ascii?Q?aBIwqbktBhgsaP76DxdFm2kkqGaG5PuIAaZTeVyKdgFSJgpM6hvskJ6rQb2A?= =?us-ascii?Q?EvKT5IY43RMmCB6odKigqQKicOCDRGqzAq3FGJinbyoSF6BCPV0VKD4SQHWN?= =?us-ascii?Q?Qc8c40CnvufkylGDYJiCOcIP/MePctnMQ+mhn94AAvymO7o6V5t6hmEIDLb8?= =?us-ascii?Q?k4l2CIBQSd8/bWOBdGrR2EIODowI2npA2YYudktVlsUluETYSOoBjiGNJ5wh?= =?us-ascii?Q?2/iVBunRH0xlTn0Lkenj1s3ogFvppdzHG5eXMePTGKBo2HjNMxXdlySsUDBB?= =?us-ascii?Q?vkgYJEkxzO+FkyLkTbXXA+q9RSZNNEg9xupYvAA3Sl73BIKYXm9VEhFIupcf?= =?us-ascii?Q?uIp3b8oW0Ovjk5PSYb24U+AYuqYmRxJ98EJvd+Xyog0wQFN1FEjckwbDtxvR?= =?us-ascii?Q?pOIAPvOCey3zZhz/nQyf0YBQ3EqfOYdB1fsrFZR3FAb1mq3KRl/ZroImlj0J?= =?us-ascii?Q?+MMJdKhnfd7kknycuDSt4p5cGgOoReJem3klJcoTGnMBl5r4+dEKISGgEHrI?= =?us-ascii?Q?0rHcnqmokOlSDUTVVp2S1QLW2AmaTWzSmNXT3Cj24vUOMY7s5NhEAHpbYRg9?= =?us-ascii?Q?s2ueWyDbFd01FU9EAERohe19vdKRihCZY7n1k53VBqkSkb2CBywY/Ftxq7Pf?= =?us-ascii?Q?trC8YTG1oJY/cA8NDjJ66gJFXUOZMxs6WI7Gn9Gjah5G1jrp1Z1a1xXzDuC2?= =?us-ascii?Q?zk4k3Css56AcIjhoH09VgGkxBdq/zVEpH+SfdYYRQhAIa5KGx+4WZGNN210T?= =?us-ascii?Q?V614R7fN1DNT3iK7GY77wjcaNGq/7EUMyH5702IjT5E+pkdZqlDbqNHQAEgq?= =?us-ascii?Q?3nzWgyKKxeu1OlHCizasQTwOQ7srmU2iyszmVj3KldeeEW2ZVCEyAvzBr4wx?= =?us-ascii?Q?JfQoxUP5jKxCHeXMyNoU=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2001; 6:Eqm59odKA4wfWuDIGwABSd7GopH5JBFUZkudZUO1y/AzAuky/Ded5HnpjiCofRTv0yX0a0YTfRx/9AoRcQtY3NHH3XoX9F14XID6jFg82iGNUEqxzDj8XHpB/fc6AzCgkcyXqYj1TCcCjYnqs4YiezeQLRSJMlzPdtAkaoGQZdekyxgtA6B0nxkcvm9PEg11IoKZcKMy40NowDBwqGVLfSlqZN+C8f+JshUB9DxJQ2Fq9hPvtzXz/coVv501SZ8umaDuJsIG7Kr6inWvRkcOIzglI6bLFOjAtHPL+4sUs0Bqm+uzZK36wGN2WlEjqpnP; 5:pbh4rMqVox/vjjIOZ0iCfC7Zx3IZeVv4ifo1ZS3Wd6WXjawHwQI5wjE20/5kvhzK3R8AHhYIx+tofG7XNm/FvZ8xcVeJHJqWEq/H7qxlPzOxyKmK9fxiQwhslm/ps878UiRZQK8Tk31WcqAEeNQZEzIveLKnpXzMlNMENlJOl29YwGk985H+rnvVLKS8JM8M; 24:gyxp6cYaxLdn0Ml78grgl2RPmeSgrO1mcrV8Vraa3j6ylpHUhTNTn6x8YlOyjqapPoIC6vwyN+PULqZUMJiWYsOoSGf7mB7fg72PrzA0qAg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2001; 7:+9Z7GByXt/9khGaCErhIN/TwmWOlIgbfETSCXmqRwOKcmQfT5Y9d0poo0WjIzq+73UUCUOy8ND8tR09PdG4IjZZ5mFL/JshRWSSnfjxmrc5GdCimjATCQB4VRWJfrY+NfzI2lyflL1xw4CpHKgg0RfFxR3KM/LUqk4jddTRN+OEgXnlD7fbPsW00yBePDELU7yQ+pkbvbmV7vxHvE8LwZGJ04p7cQhK6LL52mdmL4+O8tR3rCKkesTBR1fyooj1a0uh98txCcmbnBsFKO/sOygUQ/N7AygleDdsU+sfVDU5GKCW0xx3I6nnouxKbFbeb9KWAWO0K/QS8PALFaTfOKA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2016 07:33:07.3522 (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: BLUPR0301MB2001 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: madalin.bucur@nxp.com Cc: linuxdev.baldrick@gmail.com, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Madalin Bucur Make module params static, proper NULL checks, remove __iomem label when misused. Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/fman/fman.c | 6 +++--- drivers/net/ethernet/freescale/fman/fman_port.c | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index ef5f228..fb25748 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -2462,7 +2462,7 @@ EXPORT_SYMBOL(fman_get_mem_region); * particular forwarding scenarios that add extra headers to the * forwarded frame. */ -int fsl_fm_rx_extra_headroom = FSL_FM_RX_EXTRA_HEADROOM; +static int fsl_fm_rx_extra_headroom = FSL_FM_RX_EXTRA_HEADROOM; module_param(fsl_fm_rx_extra_headroom, int, 0); MODULE_PARM_DESC(fsl_fm_rx_extra_headroom, "Extra headroom for Rx buffers"); @@ -2475,7 +2475,7 @@ MODULE_PARM_DESC(fsl_fm_rx_extra_headroom, "Extra headroom for Rx buffers"); * Could be overridden once, at boot-time, via the * fm_set_max_frm() callback. */ -int fsl_fm_max_frm = FSL_FM_MAX_FRAME_SIZE; +static int fsl_fm_max_frm = FSL_FM_MAX_FRAME_SIZE; module_param(fsl_fm_max_frm, int, 0); MODULE_PARM_DESC(fsl_fm_max_frm, "Maximum frame size, across all interfaces"); @@ -2868,7 +2868,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev) fman->dts_params.base_addr = devm_ioremap(&of_dev->dev, phys_base_addr, mem_size); - if (fman->dts_params.base_addr == 0) { + if (!fman->dts_params.base_addr) { dev_err(&of_dev->dev, "%s: devm_ioremap() failed\n", __func__); goto fman_free; } diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c index 6de808e..8b043e7 100644 --- a/drivers/net/ethernet/freescale/fman/fman_port.c +++ b/drivers/net/ethernet/freescale/fman/fman_port.c @@ -1477,7 +1477,8 @@ EXPORT_SYMBOL(fman_port_cfg_buf_prefix_content); */ int fman_port_disable(struct fman_port *port) { - u32 __iomem *bmi_cfg_reg, *bmi_status_reg, tmp; + u32 __iomem *bmi_cfg_reg, *bmi_status_reg; + u32 tmp; bool rx_port, failure = false; int count; @@ -1553,7 +1554,8 @@ EXPORT_SYMBOL(fman_port_disable); */ int fman_port_enable(struct fman_port *port) { - u32 __iomem *bmi_cfg_reg, tmp; + u32 __iomem *bmi_cfg_reg; + u32 tmp; bool rx_port; if (!is_init_done(port->cfg)) @@ -1743,7 +1745,7 @@ static int fman_port_probe(struct platform_device *of_dev) port->dts_params.base_addr = devm_ioremap(port->dev, res.start, resource_size(&res)); - if (port->dts_params.base_addr == 0) + if (!port->dts_params.base_addr) dev_err(port->dev, "%s: devm_ioremap() failed\n", __func__); dev_set_drvdata(&of_dev->dev, port);