* [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy()
@ 2019-02-19 9:06 Mao Wenan
2019-02-19 9:04 ` Julia Lawall
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Mao Wenan @ 2019-02-19 9:06 UTC (permalink / raw)
To: kernel-janitors, netdev, john.fastabend, hawk, jakub.kicinski,
daniel, ast, julia.lawall
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 <maowenan@huawei.com>
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy()
2019-02-19 9:06 [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy() Mao Wenan
@ 2019-02-19 9:04 ` Julia Lawall
2019-02-19 12:40 ` walter harms
2019-02-19 21:25 ` David Miller
2 siblings, 0 replies; 8+ messages in thread
From: Julia Lawall @ 2019-02-19 9:04 UTC (permalink / raw)
To: Mao Wenan
Cc: kernel-janitors, netdev, john.fastabend, hawk, jakub.kicinski,
daniel, ast, Julia Lawall
On Tue, 19 Feb 2019, Mao Wenan wrote:
> 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 <maowenan@huawei.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
> ---
> 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
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy()
2019-02-19 9:06 [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy() Mao Wenan
2019-02-19 9:04 ` Julia Lawall
@ 2019-02-19 12:40 ` walter harms
2019-02-19 21:25 ` David Miller
2 siblings, 0 replies; 8+ messages in thread
From: walter harms @ 2019-02-19 12:40 UTC (permalink / raw)
To: Mao Wenan
Cc: kernel-janitors, netdev, john.fastabend, hawk, jakub.kicinski,
daniel, ast, julia.lawall
Am 19.02.2019 10:06, schrieb Mao Wenan:
> 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 <maowenan@huawei.com>
> ---
> 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,
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy()
2019-02-19 9:06 [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy() Mao Wenan
2019-02-19 9:04 ` Julia Lawall
2019-02-19 12:40 ` walter harms
@ 2019-02-19 21:25 ` David Miller
2 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2019-02-19 21:25 UTC (permalink / raw)
To: maowenan
Cc: kernel-janitors, netdev, john.fastabend, hawk, jakub.kicinski,
daniel, ast, julia.lawall
From: Mao Wenan <maowenan@huawei.com>
Date: Tue, 19 Feb 2019 17:06:35 +0800
> 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 <maowenan@huawei.com>
> ---
> 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()".
Applied to net-next.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy()
@ 2019-02-19 12:42 Walter Harms
2019-02-19 12:52 ` maowenan
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Walter Harms @ 2019-02-19 12:42 UTC (permalink / raw)
To: Mao Wenan
Cc: kernel-janitors, netdev, john.fastabend, hawk, jakub.kicinski,
daniel, ast, julia.lawall
Am 19.02.2019 10:06, schrieb Mao Wenan:
> 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 <maowenan@huawei.com>
> ---
> 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++) {
the loop here seems also pointless, so you can eliminate i.
(or did i muss something ?)
just my 2 cents,
re,
wh
> 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,
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy()
2019-02-19 12:42 Walter Harms
@ 2019-02-19 12:52 ` maowenan
2019-02-19 14:23 ` Dan Carpenter
2019-02-19 17:46 ` Andrew Lunn
2 siblings, 0 replies; 8+ messages in thread
From: maowenan @ 2019-02-19 12:52 UTC (permalink / raw)
To: Walter Harms
Cc: kernel-janitors, netdev, john.fastabend, hawk, jakub.kicinski,
daniel, ast, julia.lawall
On 2019/2/19 20:42, Walter Harms wrote:
>
> Am 19.02.2019 10:06, schrieb Mao Wenan:
>> 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 <maowenan@huawei.com>
>> ---
>> 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++) {
>
>
> the loop here seems also pointless, so you can eliminate i.
> (or did i muss something ?)
>
good point.Thank you.
> just my 2 cents,
> re,
> wh
>> 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,
>
> .
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy()
2019-02-19 12:42 Walter Harms
2019-02-19 12:52 ` maowenan
@ 2019-02-19 14:23 ` Dan Carpenter
2019-02-19 17:46 ` Andrew Lunn
2 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2019-02-19 14:23 UTC (permalink / raw)
To: Walter Harms
Cc: Mao Wenan, kernel-janitors, netdev, john.fastabend, hawk,
jakub.kicinski, daniel, ast, julia.lawall
On Tue, Feb 19, 2019 at 01:42:03PM +0100, Walter Harms wrote:
>
> Am 19.02.2019 10:06, schrieb Mao Wenan:
> > -
> > for (i=1; i<2; i++) {
>
>
> the loop here seems also pointless, so you can eliminate i.
> (or did i muss something ?)
>
True. But please do it in a separate patch.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy()
2019-02-19 12:42 Walter Harms
2019-02-19 12:52 ` maowenan
2019-02-19 14:23 ` Dan Carpenter
@ 2019-02-19 17:46 ` Andrew Lunn
2 siblings, 0 replies; 8+ messages in thread
From: Andrew Lunn @ 2019-02-19 17:46 UTC (permalink / raw)
To: Walter Harms
Cc: Mao Wenan, kernel-janitors, netdev, john.fastabend, hawk,
jakub.kicinski, daniel, ast, julia.lawall
> > for (i=1; i<2; i++) {
>
>
> the loop here seems also pointless, so you can eliminate i.
> (or did i muss something ?)
If you widen out your view a bit, you find all this code is inside a
#ifdef PHY_CODE_IS_FINISHED. I don't see anything which actually
defines that.
So a lot more code could probably be removed.
Andrew
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-02-19 21:25 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-19 9:06 [PATCH v3] net: ns83820: code cleanup for ns83820_probe_phy() Mao Wenan
2019-02-19 9:04 ` Julia Lawall
2019-02-19 12:40 ` walter harms
2019-02-19 21:25 ` David Miller
2019-02-19 12:42 Walter Harms
2019-02-19 12:52 ` maowenan
2019-02-19 14:23 ` Dan Carpenter
2019-02-19 17:46 ` Andrew Lunn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).