openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: ns83820: code cleanup for ns83820_probe_phy() 

This patch is to do code cleanup for ns83820_probe_phy().
It deletes unused variable 'first', commented out code,
and the pointless 'for' loop.

Signed-off-by: Mao Wenan <maowenan@huawei.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mao Wenan 2019-02-19 21:45:10 +08:00 committed by David S. Miller
parent 3b9c9f3b0b
commit c2a5994fbb
1 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/net/ethernet/natsemi/ns83820.c
View File

@ -1869,56 +1869,28 @@ static unsigned ns83820_mii_write_reg(struct ns83820 *dev, unsigned phy, unsigne
static void ns83820_probe_phy(struct net_device *ndev) static void ns83820_probe_phy(struct net_device *ndev)
{ {
struct ns83820 *dev = PRIV(ndev); struct ns83820 *dev = PRIV(ndev);
static int first; int j;
int i; unsigned a, b;
#define MII_PHYIDR1 0x02
#define MII_PHYIDR2 0x03
#if 0 for (j = 0; j < 0x16; j += 4) {
if (!first) { dprintk("%s: [0x%02x] %04x %04x %04x %04x\n",
unsigned tmp; ndev->name, j,
ns83820_mii_read_reg(dev, 1, 0x09); ns83820_mii_read_reg(dev, 1, 0 + j),
ns83820_mii_write_reg(dev, 1, 0x10, 0x0d3e); ns83820_mii_read_reg(dev, 1, 1 + j),
ns83820_mii_read_reg(dev, 1, 2 + j),
tmp = ns83820_mii_read_reg(dev, 1, 0x00); ns83820_mii_read_reg(dev, 1, 3 + j)
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++) { /* read firmware version: memory addr is 0x8402 and 0x8403 */
int j; ns83820_mii_write_reg(dev, 1, 0x16, 0x000d);
unsigned a, b; ns83820_mii_write_reg(dev, 1, 0x1e, 0x810e);
a = ns83820_mii_read_reg(dev, i, MII_PHYIDR1); a = ns83820_mii_read_reg(dev, 1, 0x1d);
b = ns83820_mii_read_reg(dev, i, MII_PHYIDR2);
//printk("%s: phy %d: 0x%04x 0x%04x\n", ns83820_mii_write_reg(dev, 1, 0x16, 0x000d);
// ndev->name, i, a, b); ns83820_mii_write_reg(dev, 1, 0x1e, 0x810e);
b = ns83820_mii_read_reg(dev, 1, 0x1d);
for (j=0; j<0x16; j+=4) { dprintk("version: 0x%04x 0x%04x\n", a, b);
dprintk("%s: [0x%02x] %04x %04x %04x %04x\n",
ndev->name, j,
ns83820_mii_read_reg(dev, i, 0 + j),
ns83820_mii_read_reg(dev, i, 1 + j),
ns83820_mii_read_reg(dev, i, 2 + j),
ns83820_mii_read_reg(dev, i, 3 + j)
);
}
}
{
unsigned a, b;
/* read firmware version: memory addr is 0x8402 and 0x8403 */
ns83820_mii_write_reg(dev, 1, 0x16, 0x000d);
ns83820_mii_write_reg(dev, 1, 0x1e, 0x810e);
a = ns83820_mii_read_reg(dev, 1, 0x1d);
ns83820_mii_write_reg(dev, 1, 0x16, 0x000d);
ns83820_mii_write_reg(dev, 1, 0x1e, 0x810e);
b = ns83820_mii_read_reg(dev, 1, 0x1d);
dprintk("version: 0x%04x 0x%04x\n", a, b);
}
} }
#endif #endif