From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A556C43381 for ; Tue, 19 Feb 2019 08:53:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 232582147C for ; Tue, 19 Feb 2019 08:53:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727835AbfBSIxC (ORCPT ); Tue, 19 Feb 2019 03:53:02 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:57284 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727500AbfBSIxC (ORCPT ); Tue, 19 Feb 2019 03:53:02 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id AB6D4D9A300AAAC914B3; Tue, 19 Feb 2019 16:53:00 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.408.0; Tue, 19 Feb 2019 16:52:55 +0800 From: Mao Wenan To: , , , , , , , Subject: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy() Date: Tue, 19 Feb 2019 17:06:35 +0800 Message-ID: <20190219090635.134457-1-maowenan@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch is to do code cleanup for ns83820_probe_phy(). It deletes unused variable 'first' and commented out code. Signed-off-by: Mao Wenan --- v2->v3: delte unused variable 'first'; change subject from "net: ns83820: drop pointless static qualifier in ns83820_probe_phy()" to "net: ns83820: code cleanup for ns83820_probe_phy()". drivers/net/ethernet/natsemi/ns83820.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c index 958fced4dacf..955d34a6f0d8 100644 --- a/drivers/net/ethernet/natsemi/ns83820.c +++ b/drivers/net/ethernet/natsemi/ns83820.c @@ -1869,34 +1869,16 @@ static unsigned ns83820_mii_write_reg(struct ns83820 *dev, unsigned phy, unsigne static void ns83820_probe_phy(struct net_device *ndev) { struct ns83820 *dev = PRIV(ndev); - static int first; int i; #define MII_PHYIDR1 0x02 #define MII_PHYIDR2 0x03 -#if 0 - if (!first) { - unsigned tmp; - ns83820_mii_read_reg(dev, 1, 0x09); - ns83820_mii_write_reg(dev, 1, 0x10, 0x0d3e); - - tmp = ns83820_mii_read_reg(dev, 1, 0x00); - ns83820_mii_write_reg(dev, 1, 0x00, tmp | 0x8000); - udelay(1300); - ns83820_mii_read_reg(dev, 1, 0x09); - } -#endif - first = 1; - for (i=1; i<2; i++) { int j; unsigned a, b; a = ns83820_mii_read_reg(dev, i, MII_PHYIDR1); b = ns83820_mii_read_reg(dev, i, MII_PHYIDR2); - //printk("%s: phy %d: 0x%04x 0x%04x\n", - // ndev->name, i, a, b); - for (j=0; j<0x16; j+=4) { dprintk("%s: [0x%02x] %04x %04x %04x %04x\n", ndev->name, j, -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mao Wenan Date: Tue, 19 Feb 2019 08:53:07 +0000 Subject: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy() Message-Id: <20190219090635.134457-1-maowenan@huawei.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kernel-janitors@vger.kernel.org, netdev@vger.kernel.org, john.fastabend@gmail.com, hawk@kernel.org, jakub.kicinski@netronome.com, daniel@iogearbox.net, ast@kernel.org, julia.lawall@lip6.fr This patch is to do code cleanup for ns83820_probe_phy(). It deletes unused variable 'first' and commented out code. Signed-off-by: Mao Wenan --- v2->v3: delte unused variable 'first'; change subject from "net: ns83820: drop pointless static qualifier in ns83820_probe_phy()" to "net: ns83820: code cleanup for ns83820_probe_phy()". drivers/net/ethernet/natsemi/ns83820.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c index 958fced4dacf..955d34a6f0d8 100644 --- a/drivers/net/ethernet/natsemi/ns83820.c +++ b/drivers/net/ethernet/natsemi/ns83820.c @@ -1869,34 +1869,16 @@ static unsigned ns83820_mii_write_reg(struct ns83820 *dev, unsigned phy, unsigne static void ns83820_probe_phy(struct net_device *ndev) { struct ns83820 *dev = PRIV(ndev); - static int first; int i; #define MII_PHYIDR1 0x02 #define MII_PHYIDR2 0x03 -#if 0 - if (!first) { - unsigned tmp; - ns83820_mii_read_reg(dev, 1, 0x09); - ns83820_mii_write_reg(dev, 1, 0x10, 0x0d3e); - - tmp = ns83820_mii_read_reg(dev, 1, 0x00); - ns83820_mii_write_reg(dev, 1, 0x00, tmp | 0x8000); - udelay(1300); - ns83820_mii_read_reg(dev, 1, 0x09); - } -#endif - first = 1; - for (i=1; i<2; i++) { int j; unsigned a, b; a = ns83820_mii_read_reg(dev, i, MII_PHYIDR1); b = ns83820_mii_read_reg(dev, i, MII_PHYIDR2); - //printk("%s: phy %d: 0x%04x 0x%04x\n", - // ndev->name, i, a, b); - for (j=0; j<0x16; j+=4) { dprintk("%s: [0x%02x] %04x %04x %04x %04x\n", ndev->name, j, -- 2.20.1