From patchwork Mon Nov 14 22:39:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 694754 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 3tHlnb2HYTz9rxm for ; Tue, 15 Nov 2016 09:39:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="V6/QpacF"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964969AbcKNWj1 (ORCPT ); Mon, 14 Nov 2016 17:39:27 -0500 Received: from mail-by2nam03on0071.outbound.protection.outlook.com ([104.47.42.71]:58423 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933841AbcKNWjZ (ORCPT ); Mon, 14 Nov 2016 17:39:25 -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=V6/QpacFzVTi5Rcy3evU3HjcbYoIC72QlLctxLO4/OwimvVtG7iM5rsYhSt5ctJ7xAht1e6SvT5zil+axslOUZplEH0ewK/MpoonJPXoyyt4aWDlIMU48Pm1g0sSaScOv88itBVaIgxba/lY1wP4IjdA0O6x1StQ9x2MHY3SCe0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by DM5PR12MB1145.namprd12.prod.outlook.com (10.168.236.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.707.6; Mon, 14 Nov 2016 22:39:20 +0000 From: Tom Lendacky Subject: [PATCH net-next v2 2/2] amd-xgbe: Fix up some coccinelle identified warnings To: CC: , , David Miller Date: Mon, 14 Nov 2016 16:39:16 -0600 Message-ID: <20161114223916.25437.44335.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20161114223856.25437.13649.stgit@tlendack-t1.amdoffice.net> References: <20161114223856.25437.13649.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: BN6PR15CA0016.namprd15.prod.outlook.com (10.172.204.154) To DM5PR12MB1145.namprd12.prod.outlook.com (10.168.236.140) X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 2:2DlGbERTEedZm6+oyVUkPHUAHJMQ4XwSBOxY1gVmPKXJPOMHZ9hVZMhih9Qp+Hrs9GoaWCeKuVoHMiGrLH+vLEIQPhwp/T93h7lyB/w8cgRqNwPFLCylLItf1fAxqbBfQXjwBaLlBRGVewIjLGwH7WKxW49LhaMIlCfeQBT52no=; 3:CwhV6fwBjNnVHDK+4M/Ft94zr0No/X8jdzIgVc5NBDoAOdO5BUO2RNhfbD3TNVbKTKzSwtAXyQ6i6nxte6YvescilsxyBYv4LBK+6AK9I+kuRttiPfoniKSvWua9NBg9f7W0WLvMZroymz6rZg/7NePlDAJuWMtUY1tuAe3R57M= X-MS-Office365-Filtering-Correlation-Id: d17bb0ea-ee54-4c8c-c766-08d40cdf13a6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR12MB1145; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 25:Go9ybJ+x22HMoKyz/K7B0uzwvX94laaUeIYJtA/F+xPIcz44wfB7FPI1WqwBWYYs74P01I1pcK9BkavvdtjRlXHTWQFjqX+hjcDou/+FRs5yIC2rhIC8Wt9W5UOi/6zrkZyo81t3p/bUs8RfMKMFWzwfoLexy7uVaeF6MQGAO8y6eAyTbUK+snQoZG2I8Rom134QUFWLt/dRvDMj0QW89BPXyMJHtqvIVoYIlBmURvjYNnewMff0lBijy7EHSzKgWyL23ksPrZeH0ubQ8yEE8w5Eo9kYpjj2v96IYwyJ9QgtTZM8Ilouy9Q3t9WxtpHBmOBq8xWEANInNI96jmJKOMPKjR1nMLI4YR9TGCg93JSj0YkYkF+C5PyhAxdmgEJPVPmBNuTtUHRqzIzemeOi9kGkNV0crbQaXcQPCPoxTkyzkoxZecgdUwC0V6E/QvXVSn7ZiJvpsmnYvabfOFec/x21jdzrGrwSpfjN+oR8X8kLg9XuSYeCjC2w4TkqwOt4+UogOl6hHV6ty8cKCq04y6pvGVbV4d7HQSgiVtIbqAOoUwc6NFKoLfLBAxcmVUQsICBwCYHTPnCjnlxc+9FZkhwSsWj9YDoYjVUl1tdc6toEoFSIHfQz4vBd9angL5avUpwYMd+/hepR3pAa0l8v+scPQnHX4S2EDMGmQUKtKaPKSKYmJnFrkze5FwATa/FB5yVafwtT6V9O2c3KKz6heoUKjZhvLFNwZlMqohyNgS6hm4E6hbr7Yg8OPfClAPQ+ X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 31:0NlCzeTlcNEUbMgWT2jzcFUnQmPTKVzlwpEmEisLy0PFclb0I7QT52NFlKbf1KRa/h7OPmmUsVONkWF5gPuYAO/xANQlQwHBgiTLfh3xUtU0mkzL2nll9NK6zlRlDiwq47lHNX7QSTTcx7cPVuCFbbLvWr3/JLB7/Nwez16pc/D0bNTRmoExuFp3GM+rwlXfuCVzO/oT+lc3Fgun6RPyWDgSpTliWbiBcvluzOlOBBQ299qBk6buJmdhK01kuqtpmDULABnA32RAFxGR7dUx6ibWCOv5qX6AZaZJ5lEnE0c=; 20:2ydtdA99yQyh0C/EfT2B3Ylpq4EPZHxJKz5lY0SfxYLo1t0jP5IeElH8mPVhnk8nr/u6keGG8OcCY/6d8bvdSeYSDuRH8ck/p8/2Ar9Vy7e5cQbQu/ZGQv+hsz9PjzLknqC7iszEBRWT6wy7FGrQ14Ty1b7ov9gw408sYLerQVuMZWGP0p5F2Kr836ofLAlCTz2b9Ogt12HG0NyHLYawo4S5c7usZ1GkRTrsI3dODqeTIDpoM3j20BYpaJlp8QIM6LVElFDa7bUq6XpHFzor5RFcCKDFh+dB928qHs5c25dtZUa053KCp1yyIVsI/dRcPoALRy7NXyuvw3tVbfDauAVOeZ1Pm8s6g6DX+TZJbAa7JXdXUM7zagRThn4hEIrQ3bMJK6/XHYIs1eYQvadff0L5M6bqpNqxZlX8RyTnf6JzlX5VBrSE902bmKOxjDLZW3fFjzcyLjAKhrnIpqFd1v8VhL1mJPUW+XrWa2GkxHcDUgx4a5K4YJVPqQWNs9uL 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)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6061324); SRVR:DM5PR12MB1145; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1145; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 4:9kItU+HKNQc9UJFdeNCNJCAXuhlItrsTG1Rtl9hhFpOJLOC6HVPGzNE3jl9VpdqeFmxIoeisiAm5EAm/0TE8VaHSxkbjZL9zwNEaZB7gBKtLlo9YjLxmiDE8haNTR3pXxVbneHMvoMea3OsyA7Zr4wFiu8846kdVr4kLxV2BrneBASQKt3z3GXAeh/uY6m5ibT1yf9Y5HI8Ryl1Yf1WNLvSFLD3llVp39rY3R+SbeHjPoTCd0gn7oneG3vp7aBxxipf2YJ2RxDwr/fJM9oGBgTR204kLnE3mZMkQFS5GhqtVVHaZr2AtNSFGs4FiUmYcGByv9rG43NObmtHDwQGU65K24hrI2+vPipjfDm0W+NyMK9ahJsrYKt9jgyK9PCZDSF26q/7d0KAanCeHEJ0+CGhYbkMBhLak2GLPPOicy4Ul6zaBSxoNiQ11u/6fX+tHdECjlAD1031Ay8ntvxSUWx046GhyXC22zs5j5U1OxvQ= X-Forefront-PRVS: 0126A32F74 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(101416001)(189998001)(81156014)(47776003)(66066001)(54356999)(50466002)(76176999)(50986999)(97736004)(4001350100001)(23676002)(81166006)(33646002)(53416004)(105586002)(97746001)(106356001)(103116003)(42186005)(92566002)(86362001)(77096005)(2351001)(2950100002)(6666003)(1076002)(6116002)(83506001)(6916009)(68736007)(3846002)(110136003)(7846002)(69596002)(2906002)(4326007)(9686002)(230700001)(5660300001)(7736002)(305945005)(8676002)(71626007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1145; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjEyTUIxMTQ1OzIzOjNkMGdIUVdmbExCdkN1MHRxZWhsUzJOK2t5?= =?utf-8?B?eTlpTHpJQUhQcWpVWWFnNkFUNS9MdXJBVTlHT3FNMTZ5RnUwbGJqSFVyVHdZ?= =?utf-8?B?RHA3YW1FcC9lb0p6SlJpQnB4VkFVRzc2TUU4eGtQRnhwQktFQ3dQSG42TnNk?= =?utf-8?B?VG8yS1p2NFh4RjZWdXBlTGZva3dDcDZJRGRDdzFHcE1qOWhWQklFUHBUZnFt?= =?utf-8?B?RmwxTEgyT29tV0R6aDA4ajA4RnVIWXFvVDVGV3U1c09hamR1ZGRaRG9yTFJF?= =?utf-8?B?YWt2UVFHaTdqK05vM3lMQXBiT2ZQNTFSdEJBaUlielZ2Y216amdlOFN3RjRD?= =?utf-8?B?QTNMd29XWjU1VVN4anlOSk51R0hHNGhIZ3pDV3dFblhpOG1Ya0wyd3N3UHFm?= =?utf-8?B?RzR3TXZ6aVdNc25kK2sySEtLUXMyMXg3cDRQVnhlSHUzVE5kNlNjd240NDJQ?= =?utf-8?B?WG1vYUZQQnBBbzhWNmhibzUyWGwrTGZEWXYzV3I0RXZ0VENVRksyUGVuN2U1?= =?utf-8?B?cEtsU1RSWEtNZHVITXN3NkFkQ1p6SUkwanZHVFdDNVBxZVZhSkFHNFRzK0xP?= =?utf-8?B?VWlTbVRIbnFBYXhORHdmRk5sLytaVVdwRnhOWlZBWEJPY3JmV2IxTStnQTNE?= =?utf-8?B?Qi9obm84L3NmNm53NjBiYjVpdUZJQ29CQ1Q2Z3BWRyt0M3dHcC9sVWFjeHFj?= =?utf-8?B?d1QrSkhFbVZDSUxGMnJ4UUVGWGNaeEpBa2ZMb2wwQmI3aG1TVUNuS1d4aTdR?= =?utf-8?B?dmtGSm9NTFhkbTJ1akdUVm1mc04yKzdFUjdDVGF6aDNPTVVpVVQ1Q2l6UXVS?= =?utf-8?B?VnVaS0ZnazkweXlyVHc4bmY1b25pUGZSdGVocjZJc0xMb3krUnFSYjBhRlcw?= =?utf-8?B?UlM5dllnWU4vckYrVmJBdENQbU5ocFV0RENWcDBOUlBQbDZwWkFCbkhlc2lI?= =?utf-8?B?aVBtU3JsQ243YkhmNTFoOGRQd2sydGVOZWRtNk92akl4OVRYYlF4VTJDczkr?= =?utf-8?B?SlpxRGh1Y3Y4VURMaWRWT1ZzaVM0cVNSM2M2NC9Za0ZKMGNjdnRncHJ0Y2hY?= =?utf-8?B?OUxMbTh2Ujh1VVEvczkvQy80dE82Zjk0U3duTDJ3QUV4Y0toOVRJVXVLY0Zl?= =?utf-8?B?MFYwTGFPMmt4LzM1eVo0VEdPRm95OS9WNWRybDF3eHArRTROaUlHUGxTSHdx?= =?utf-8?B?ODBTV1ZxM2JFTHBPV1lLdmN0N01tZy82YnVDc1FIUG1ESDNYc2FkOWxyUjJF?= =?utf-8?B?UThwN2ZsVndTVWJsdkZtQnRQZDFZdElCaHJSREZKa085VkhCZ0hHeHo4Z0pw?= =?utf-8?B?VTNDenZya3NZcXBWbEN0NjZSeXlLUFlIMVFiQXhvcmxxWjRic2tldjN5ZU1D?= =?utf-8?B?dWZqZnEwVGVrSS90ckJuRHExazNQNFRCL1NmUjRJZXZZUThxdDNHelNDN0x6?= =?utf-8?B?SFZFRnZjT0syUzI2Ri8vOTRueEVrd2xuMXl3TVdwS3BRSkEyOFBNMENEdndL?= =?utf-8?B?bUw3QkpsNHBzNFJTZ293YWVqakpIRXpXdU94SFlkTUtYUVZRRzVBa2FuMkN0?= =?utf-8?B?YW10S1ZsUXR4NzRnalhoN0g0OXVHNmJuTXVUdTBib09DN2RabXo2cmtlZzNO?= =?utf-8?Q?JKntvzcMXdZPhYukYuX1?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 6:W0qsskoJFOlGUblXELFOQx/7ppCoD2Aq2qu/NVOJVahVRi+0BEkm9VIseCSjomYVh5XOWw38vaIOQ74crFp35/bRU77u1u/w4s059HfCAVr5BoogzlIk8c+wa8zh/LxJAUpc47pk0goLYtArwUlfEtXMIyxvVvMB8Ctu5/dj5pgAIfoicDqLlg7eMoHgi4MCq3X/Hg+utl0m35f/tZHUFBu1RKpG5enNaeO58rlezxDCq2YBx4kJmgoitnGc7CWIGRLrSiYfB9vcvLNzMey0NcgQxOF1G8nYDoaTjbgtpa6NB/fkuAMHD/8rw8BZ3cSNuljFCdC+fHDR9FFRArOBvOSWgJc/+I/fxyP7AfgW7ddqLqL/rnLD3egUaAXA2JFv; 5:6bp5Dg/XDGui5bLVhGTTWXnD6VIlzHVOZcznlb9WPpJ3Aaihl9AoRVvt11IqIUW5rw6UMtA08dkF43Xe6DtGx5Z6wW5FyxDZTzLTD0GBdz/AkKqQJahl3Q5t/fDG/+XI9qT5tzmBTKFbMGcFpqTRJQ==; 24:1qZ5wDYtURu0aZdsOazOrepk3GOOLpZ5KT/qhIhGE60L5jhpliPVGGMVPiy9qnTnwvFYWhB4yqPw7/y/Ir7aTIXstBVBPGykY2EMkGveOSc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 7:6GAN7xfbXO/VmdeLXy/4y6fswo3kqvsEwpVCozXXwdOpnT0YyA8Cf1r/Cl6dHiQzbCM6yEB3zZG+ql6SPhHKIn9Q1i8nUfeAJIzoILaXoch3ANC09O/ok9yQ3xwJ2a5jjJrYANo91vMUPjQ43hY4GueDpQZcVgSVaL8FPgm5CI/bFvcVEElas68KAH+ikbhgvujGB7FMjomsEYOWzhaEgl0ZUdcY8vLv6m/dJ4Hrro5SQm6M+XvNtqmmCC5Ha5Kj3QoqucPxGc/6Sc9gAvtIZPua0oJ3RgXIgtrdjbr1lnzCgCXLxvVv7lKFw2Nbr4JNzkCf1kLXS6HmaUKuWij3gu1RUEhoiYKoCxBdetMylMs=; 20:wQj189D55IroNyvXVtR71KnDUJ46GDCb7Vr5RbnUtk3OAuc2NgAmQvo5MM1X8BqaokZw145fb497CIE7727h+oAl7CWfgwc+TAR/AdbSlA1CEDO3IbCFlDEuQDI1FMJTThITdjbuBzFTFo8phgDt97ypR0mH0fqXrMAQieWFT85b4QvHQPDB8/UndbVJsHZT6Kvw+rXj4W68VF9Zq637UdljyVlEW8ylIw8FGdXIH4nkmY9m1cd5pyql1qRaSDKy X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2016 22:39:20.7245 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1145 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;