Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2a5994f authored by Mao Wenan's avatar Mao Wenan Committed by David S. Miller
Browse files

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: default avatarMao Wenan <maowenan@huawei.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b9c9f3b

drivers/net/ethernet/natsemi/ns83820.c

+21 −49
Original line number Diff line number Diff line
@@ -1869,46 +1869,19 @@ 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,

				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)

			ns83820_mii_read_reg(dev, 1, 0 + j),

			ns83820_mii_read_reg(dev, 1, 1 + j),

			ns83820_mii_read_reg(dev, 1, 2 + j),

			ns83820_mii_read_reg(dev, 1, 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);
@@ -1919,7 +1892,6 @@ static void ns83820_probe_phy(struct net_device *ndev) 
	b = ns83820_mii_read_reg(dev, 1, 0x1d);

	dprintk("version: 0x%04x 0x%04x\n", a, b);

}

}

#endif



static const struct net_device_ops netdev_ops = {