From patchwork Mon Nov 14 22:28:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 694751 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 3tHlYn0kXVz9t1F for ; Tue, 15 Nov 2016 09:29:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="2OkZQ2SR"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941096AbcKNW3M (ORCPT ); Mon, 14 Nov 2016 17:29:12 -0500 Received: from mail-by2nam01on0075.outbound.protection.outlook.com ([104.47.34.75]:6270 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965030AbcKNW3F (ORCPT ); Mon, 14 Nov 2016 17:29:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mVDwFNPJpX+9r9eBBhMZV0Euoi34mbt2GMkNepUubfU=; b=2OkZQ2SRHQyEWCm9cHdEv4aS/l7YwtalVtxRe1RpRM4Hd9EfwUcVb/I36aGEiMPYSJBow5hvXDR2r3fpVM9KrGaBRQwO8J8Z+B/BA1TW8vrAt33ivTEB4j43FAUukpGD78NbYvAfZb+dIelpEW566PnfVuaVW1kFT9Jd82/f0NY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by CY4PR12MB1142.namprd12.prod.outlook.com (10.168.163.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10; Mon, 14 Nov 2016 22:29:02 +0000 From: Tom Lendacky Subject: [PATCH 2/2] amd-xgbe: Fix up some coccinelle identified warnings To: CC: , , David Miller Date: Mon, 14 Nov 2016 16:28:58 -0600 Message-ID: <20161114222858.25160.47383.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20161114222827.25160.24791.stgit@tlendack-t1.amdoffice.net> References: <20161114222827.25160.24791.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0057.namprd21.prod.outlook.com (10.172.93.147) To CY4PR12MB1142.namprd12.prod.outlook.com (10.168.163.150) X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1142; 2:tVNy65e3Cz42X5xd8tHqdUIAlJoiF3VlVa8K09ptF+DRwq1ADMMbPGvACVD8pu76xfr5BEy45USofSbaLs8yX7KQywCPUxhl+cV5w+aYh7bOoynBtXpGyfcc5qB4oYM6iohBvl+dzXbiK82wPOAGQb71m5fNSNmVJObXBmYfWxA=; 3:SSo4OhdefWNFEknvCtlPW96jV1hUHIoIr3fiNkFiGewdiCpPDMD3lABbl5C1hDtK2Nor8ljwjDWFNdg4jtntDkYILRkHt7NOnxnaKHA+kCckj0xWxzayHM++hK0OMDsTqQAyFALo6ZUEOnV/xKk1rpQadXKjV2kZ6SvRKV7s2rY=; 25:w5D9inOEsImpBmXVsDZy3qSgl0VIgeF6BKi0pScluUiysQWTupxNKUpv789TSXY3V4qM6O6Lgvc4//S+Ul4jycmoxEZu0mmFuBaZ6LYQHvExgHJbozbSrm7bjNuXSv5uf5H7Nt90MWpdHSFnKZMYCmo/pqTCdig25VPcxucR295xqbKTqh+2UzU0XABHIoqQz8AHyLb43Bk/SuSRL7yT8Wj1K5a2ZHgKfv9M7Oo6Xk2g+VMlEuKvEqigm8xPKUw6Mlf/umB0syTc2jBHyUYa+57li9mP+pWNcDb5pypttSUERMgto/Cm1nIDMsWLgAUb9H2OmmaSzJgVX5FeE3Nil22L39YwPLn/g1CcnWeqlbA0v2Mz5xAPA1tBAuaHGKbCPi+o0PKIIMI04cmsxFzqxRiQQPEKytCN9vOyt3pU3diWD+EIgS/vEv0ATDYF3maz X-MS-Office365-Filtering-Correlation-Id: 59ed5703-43d1-47cc-d237-08d40cdda2f0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR12MB1142; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1142; 31:FurjlxmOlRl1PmNaX7+MSwoRwvArPCYrUPxEVXKmwKhntgZnslYXbC3L+ZqjHgmRpsRLnsIXog65qT5rlawMb7v6PnLqanbSN0mhvB69uy0VE4YBFW9RIxfkKTZeisoQVNbfFWDpb4CO79xQ5kymq6qXKOPs72hG9GOQOr3dHlEvG66Y/E3Zhw+qy8/BNaxU6uYy5xCVRzpVFkNyGTN7bNTB8mV+MeJw/rWjs/JzbO+gVO7vW3RjX9xNDJR1xyPO; 20:l1+TLCwRqxG3fN8QVMYEkGCpWMXQnUoEwvN16qlm/PUvHz4tjoz59nSkFkdkVcfAO/vVrmlRfLRAxzEWNKNqE1ejA4OPXJ4mis6TT8ygBL1XPInLAKWZUCl23miv689AhFAlOaq8ajGIa7t9i0QAVC2H5RTOpqnm7Cq+1MzeWu6T8vF/9+MBllZC3NpaVxjz/ZC1VeBgIdTq2Pb4lO8cuApdtxADHOT5dYCQblHqD1ELdZO2m4BJ9Hv1dpkK5VQ8fxa3pqhKfw4McsNvUc4R+sxZpbGyFX7fCwxYeVB6YolvbVqs0/LVWmMEw4lAHf5ULcoyTdWa+c3whf2FNnw2MFqxki2JJfdWHhsTtmIoTnP+uVaQP3N3HewJi5suHJemMdi2TeIZPKPC6Hbj/QN0ucaDgF/ApV4YOzpC7O5H6F6QbgYPzl4DHQSF35tx35xyTT2RYhLRzyvZmqbinpBbyP4xjQjKbFFZ1O3hrt6f5ebcAjBrfJANBihA98Ove2vp X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6060326)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6061324); SRVR:CY4PR12MB1142; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1142; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1142; 4:GtnyuJr5yrDKm2ncOHWfYYNy7oKbypkXfc7z6Dq8gPy0iQJGiibj8UQiRDjnbP4f331zDcqPRxmPn9rGQ/Zd/FAtyDxdrcWCQCCE6NDeQL4EfReWOA4P/9nFlKurkZAbbM4LJ2vP3Z5sKm70atVP/+0MlmiSUqdWuGIBD//Y1XWwTG8P6wl7LXSstDJA6mW3tJpoNTYgg3c8sgiS63+97jdps8XZH43SYWHzNlUSQv5XbMK36jpIhVE+HsfW3Hy+8gp38GSKryA6tmacpQ/NHK+8w2NdDHJaRwiI9HVCO33duI8V22sjtsI7bwc6IydHRVflv8UjUes+dVKo2T1rR6XZEr+mDzKKA17ELyP8yuZtglxvIaTuf6k+Vl8eOVGvImGlzJghJgx7IA7oD0Kf7erpsPrGDbG124kkUUr4UkLruw0/jVwRMkQ6OODPhQyVfRK4h9F+ZRfVznxLXuTPRiHuHx7oC41iCkA0x+EMyLU= X-Forefront-PRVS: 0126A32F74 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(199003)(189002)(2906002)(81156014)(77096005)(103116003)(81166006)(86362001)(9686002)(97746001)(68736007)(305945005)(97736004)(69596002)(83506001)(6666003)(7846002)(47776003)(8676002)(92566002)(7736002)(66066001)(23676002)(3846002)(50466002)(6116002)(1076002)(42186005)(2950100002)(53416004)(105586002)(106356001)(230700001)(110136003)(6916009)(101416001)(54356999)(4326007)(33646002)(5660300001)(50986999)(76176999)(189998001)(2351001)(4001350100001)(71626007); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1142; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQyOzIzOnBOYWxqbURJNjdHMzZaa3hxbCtOQzh2Y3lS?= =?utf-8?B?RXV5dFEwUVdVZ05BMitmMGJZTDBueHgvR0lNV3YxOUd1UWh6ZldnUzJvTHNm?= =?utf-8?B?ZTZlK1JTb3lPSlZJQWN1M1pWYTk0QnRqL2sxT0lXNzAxaGR2ZGNmU3JzMFdx?= =?utf-8?B?SEl4dk53cjZjOC9TY0l6K1dVNGJFZXlwWXc4TU1QNXVaVXNYVHlsWk5BRy9G?= =?utf-8?B?eEFiVEI4YXl0bERvVW9NaTI4M3BjS0VVbVFmRkM3Y3Vnd3QwaHBGMlF3all3?= =?utf-8?B?Y2FNenZzUXNtS3k1RnhEMWZteUVBcEhQQmt1ZkZhMVBFNlNFbTNWU0lwOXRW?= =?utf-8?B?SVRrdHlEWGJGVFp4SjJSTitHdnRvUGdaSEhhbk1adXBhQzR2R0w0MlVGSExp?= =?utf-8?B?V3piY3VjbkRnSXAxYXl5WEVvWFVkeUx2cngyaGdYckpqcDFvTGk3WmR1MVhD?= =?utf-8?B?MGRONXEraU5vd2FWZVgxRTArbGVFYjdHUGRMOHBMaTF2bVZ4aEx2MnpCamZK?= =?utf-8?B?NEswdWVVQkYveWErZ0JpVVIxTHdMYWpnNVdxSlBMR2FaNnFjdzArYWEzcVYz?= =?utf-8?B?ZS9BRHhWV2Z2eTN5Y0g1L2h2R1FtM3NJdzRRd2tRbG4vb2IyNkZ0L3d0b1B6?= =?utf-8?B?QnVLdlVSS2VPRWE3d1VKOCs2aWhuYzNVMVFLd1NLWWpFTHI1UUhTdUJ4STV0?= =?utf-8?B?ZGZJN1U3dkFCaENRbWFLMmJrd3M2b1ZRZU9tUG5maG9EVGlJVWs1OC9XU3Zz?= =?utf-8?B?dmhBYW5ydkVLeExNcUdPSWptYkt0d0Q3cFN6YVNFd2JxMStPdHhLQkRzdE9j?= =?utf-8?B?SE0yc2JEeG55Q0ovOWhlQVBlY2Q2ODBRZ2Zqa3RwaFNFUTJyL0hWd1kzM3ZF?= =?utf-8?B?eUNyQW5MRnJtMUdValhkUGdVcVA5OXRQdW5OV2tTdWUzc0JlMnBMZUF6b0RN?= =?utf-8?B?OFI5eElKUW5venNzSFl4TTZaM2RodXQ1bHZic29YMklJYXl2a1IrK0NSMzZT?= =?utf-8?B?WFkwZmgvS3pkbEJXZEFrU1RPSUJPa0Z2WitneWdiaENzUWwxVWJiTnJiZWc0?= =?utf-8?B?MkdKcE1wbWVIM205b0c5OXZFMU5vQzFNd3ZrM2duazR5eFByVisyMmo4Zkxl?= =?utf-8?B?RUJiL05rN0xpZHNQYWtpVXZjcENaNGNLRzlQYjVaekoybDJWUEszc2I5eGxP?= =?utf-8?B?ODJ1V0xIeVQ5U3hybnNneGVPNDRncGtNYkYxWWRzNGZXdmlwQUFaYUFVaTdu?= =?utf-8?B?bWJQR1FGTTcyckNXdE9SUFJKZWxpTDZBcnFXMEJIWlNKbUVPN2hqbHUwMjlT?= =?utf-8?B?Qk5SZHlTc0JITStnbkVjbnJZaEMySmp2UERBSzByNitvZ3o0Rkx6aTRrRUlL?= =?utf-8?B?T1JpYmNOYVZPUUtzNUZZTFFOR21mZDhVZW1lR0Q1U2xSNVpRNllQbUwwTzhB?= =?utf-8?B?NlBidXpPdTdRZ1ZoZjFaMSt5TDNrenpIdEZPR3BNNjBXakJUYzFCVzhrTy9D?= =?utf-8?B?czV0M1ltVFpzaHl0U2lNQUhWYUN5djlxZEk1dmE2c1RLVDZtbU0zbWpTdDlq?= =?utf-8?B?b1duTWM5b2dQY1U0bjY0VU9tdnVnVG5oWlk1b1VLVmhxbGJ3NGZ0bW5BUjAy?= =?utf-8?Q?22AOHsNsoTYRD2ktXEKz?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1142; 6:c0IqgxQKPA7vUT51GOH+lFh6VJ4dfOQNam+hkSV2/yvd3UMbuEP87Da2N0uKuav8bqaNU43ya5zKsmjvsE2BNdN1kR6NTgUlZIuqlifKPwKIbp4fZtKJ5SnkkTT7oRT/fXCkdX9RJPqzhgBMhf6q0KulkfHUgxRw95N6mDaKHQru1P+twYzUym2fr0BqmpaUeu5e3h34ka1cSfnn+ZQjQEOqMwR5dgQczO3jDe9VCrElPnkn6HJex9SgEikBdoo6KYSbso+cgNOOvRPZopIf3jGQOjyutRqIueDFHeUIb70RteefZBU3SWUO6YqePq/i3pZtmykfot59AQPHwtcJi8Ah+6Jnbl8Y7zhG92eiAPibXSzpzD5/RN2GzGpxvVRO; 5:qSA76LBZMf4wgIYjiHkBOyFQzUai1NQ2nR2jz8gjGguoJ5ew8MJlc+MKgofIgr/4WP15g+qKSaGrHIVka3PtiiyPEPTuxJLY2k8Y6NR3lrKPj/ekzf4yGMIRohDbjI9vGZvzqNU0MBQVF0OJq4MMRg==; 24:Dh/VZD387TqPmyRDJeYEbSuKy8nUD8S+EvQCVBqAV0YwYM5Y4lDIk8655n+dPBsvbAVyhMWjo8+mFBWlbttCcg1AAEjZFnBaWQUveXNo5RM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1142; 7:+Vgu5Q0EiQnL9aMMQRkxCOPIr8mr6HGbINGzr1aMPHyrxYE/KbTOaQiCLnV/6qvmc3O+QfcniboEm1qXhQfd/l6vEYkKjQtRqIFAz+nC1yhSk34axym3DXWw8ueCMTnKAybL58sYzC+OBAoX6L199szsAe6uzJnsRGSgL+LZRTbDaOUywgaEKEQtIqTKog6UhBmqVQcugU9rgJDZid01bzoaNXHasLN1oHiOnOxBLuCS8cOug6YpWJw0HBJjj1qq24kbEyaR11rYu6bmuYE1ywTggzgljZt+dHxyWVz4xBaacEInM0wV4f40NRbYloGf6LAIAYPp5xK/PNUxB0O2UzdNpnfBSFz1p7MMqz/OPHY=; 20:qWgaXYxt8/E123sUftOqOBuZx1z7+OmhvErqAjG2ksFBHlchR5W/x0xzw/sCk48HLf+uK4elapwGUsxcfL6kD4tLWvpeYVKbeIgnpHGVf52djXL2HwTPqgnsmMmW1Ow8JUNvGmM71gbmzQ/Oh9WnKY8cLOWra6AWw6b+QMJzsJNDq7j0Eg7hBCEVzr/we2yDvy/jXi8jEm414U7HJsbVUJTRZ0gyG7gE1w95sHYtL7mN1QuZfKAypp9TqpiSjmmv X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2016 22:29:02.1765 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1142 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix up some warnings that were identified by coccinelle: Clean up an if/else block that can look confusing since the same statement is executed in an "else if" check and the final "else" statement. Change a variable from unsigned int to int since it is used in an if statement checking the value to be less than 0. Reported-by: Julia Lawall Signed-off-by: Tom Lendacky --- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c index 4ba4332..348cc8c 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c @@ -1766,8 +1766,6 @@ static void xgbe_phy_sfi_mode(struct xgbe_prv_data *pdata) XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 1); else if (phy_data->sfp_cable_len <= 3) XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 2); - else if (phy_data->sfp_cable_len <= 5) - XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 3); else XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 3); } @@ -2346,7 +2344,8 @@ static bool xgbe_phy_valid_speed(struct xgbe_prv_data *pdata, int speed) static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart) { struct xgbe_phy_data *phy_data = pdata->phy_data; - unsigned int ret, reg; + unsigned int reg; + int ret; *an_restart = 0;