2017-12-30 11:06:38

by Jia-Ju Bai

[permalink] [raw]
Subject: [PATCH] sky2: Replace mdelay with msleep in sky2_vpd_wait

sky2_vpd_wait is not called in an interrupt handler nor holding a spinlock.
The function mdelay in it can be replaced with msleep, to reduce busy wait.

Signed-off-by: Jia-Ju Bai <[email protected]>
---
drivers/net/ethernet/marvell/sky2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 9efe177..9fe8530 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4287,7 +4287,7 @@ static int sky2_vpd_wait(const struct sky2_hw *hw, int cap, u16 busy)
dev_err(&hw->pdev->dev, "VPD cycle timed out\n");
return -ETIMEDOUT;
}
- mdelay(1);
+ msleep(1);
}

return 0;
--
1.7.9.5


2017-12-30 17:19:16

by Stephen Hemminger

[permalink] [raw]
Subject: Re: [PATCH] sky2: Replace mdelay with msleep in sky2_vpd_wait

On Sat, 30 Dec 2017 19:09:47 +0800
Jia-Ju Bai <[email protected]> wrote:

> sky2_vpd_wait is not called in an interrupt handler nor holding a spinlock.
> The function mdelay in it can be replaced with msleep, to reduce busy wait.
>
> Signed-off-by: Jia-Ju Bai <[email protected]>
> ---
> drivers/net/ethernet/marvell/sky2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
> index 9efe177..9fe8530 100644
> --- a/drivers/net/ethernet/marvell/sky2.c
> +++ b/drivers/net/ethernet/marvell/sky2.c
> @@ -4287,7 +4287,7 @@ static int sky2_vpd_wait(const struct sky2_hw *hw, int cap, u16 busy)
> dev_err(&hw->pdev->dev, "VPD cycle timed out\n");
> return -ETIMEDOUT;
> }
> - mdelay(1);
> + msleep(1);
> }
>
> return 0;

When sky2 was written mdelay was equivalent to current msleep.

Acked-by: Stephen Hemminger <[email protected]>

2018-01-02 17:30:10

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] sky2: Replace mdelay with msleep in sky2_vpd_wait

From: Jia-Ju Bai <[email protected]>
Date: Sat, 30 Dec 2017 19:09:47 +0800

> sky2_vpd_wait is not called in an interrupt handler nor holding a spinlock.
> The function mdelay in it can be replaced with msleep, to reduce busy wait.
>
> Signed-off-by: Jia-Ju Bai <[email protected]>

Applied.