2015-02-06 10:31:08

by Nicholas Mc Guire

Subject: [PATCH] brcmfmac: use msecs_to_jiffies for time conversion

This is only an API consolidation and should make things more readable
it replaces var * HZ / 1000 by msecs_to_jiffies(var).

Signed-off-by: Nicholas Mc Guire <[email protected]>
---

Patch was only compile tested with x86_64_defconfig + CONFIG_BRCMFMAC=m,
CONFIG_MMC=m, CONFIG_BRCMFMAC_SDIO=y

Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)

drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
index 5e9d208..4f9469b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
@@ -3972,7 +3972,7 @@ brcmf_sdio_watchdog(unsigned long data)
/* Reschedule the watchdog */
if (bus->wd_timer_valid)
mod_timer(&bus->timer,
- jiffies + BRCMF_WD_POLL_MS * HZ / 1000);
+ jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS));
}
}

@@ -4291,13 +4291,13 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, uint wdtick)
dynamically changed or in the first instance
*/
bus->timer.expires =
- jiffies + BRCMF_WD_POLL_MS * HZ / 1000;
+ jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS);
add_timer(&bus->timer);

} else {
/* Re arm the timer, at last watchdog period */
mod_timer(&bus->timer,
- jiffies + BRCMF_WD_POLL_MS * HZ / 1000);
+ jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS));
}

bus->wd_timer_valid = true;
--
1.7.10.4

2015-02-26 13:01:46

by Kalle Valo

Subject: Re: brcmfmac: use msecs_to_jiffies for time conversion

> This is only an API consolidation and should make things more readable
> it replaces var * HZ / 1000 by msecs_to_jiffies(var).
>
> Signed-off-by: Nicholas Mc Guire <[email protected]>
> Acked-by: Arend van Spriel <[email protected]>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo

2015-02-11 18:18:36

by Arend van Spriel

Subject: Re: [PATCH] brcmfmac: use msecs_to_jiffies for time conversion

On 02/06/15 11:26, Nicholas Mc Guire wrote:
> This is only an API consolidation and should make things more readable
> it replaces var * HZ / 1000 by msecs_to_jiffies(var).

Acked-by: Arend van Spriel <[email protected]>
> Signed-off-by: Nicholas Mc Guire<[email protected]>
> ---
>
> Patch was only compile tested with x86_64_defconfig + CONFIG_BRCMFMAC=m,
> CONFIG_MMC=m, CONFIG_BRCMFMAC_SDIO=y
>
> Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)
>
> drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
> index 5e9d208..4f9469b 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
> @@ -3972,7 +3972,7 @@ brcmf_sdio_watchdog(unsigned long data)
> /* Reschedule the watchdog */
> if (bus->wd_timer_valid)
> mod_timer(&bus->timer,
> - jiffies + BRCMF_WD_POLL_MS * HZ / 1000);
> + jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS));
> }
> }
>
> @@ -4291,13 +4291,13 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, uint wdtick)
> dynamically changed or in the first instance
> */
> bus->timer.expires =
> - jiffies + BRCMF_WD_POLL_MS * HZ / 1000;
> + jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS);
> add_timer(&bus->timer);
>
> } else {
> /* Re arm the timer, at last watchdog period */
> mod_timer(&bus->timer,
> - jiffies + BRCMF_WD_POLL_MS * HZ / 1000);
> + jiffies + msecs_to_jiffies(BRCMF_WD_POLL_MS));
> }
>
> bus->wd_timer_valid = true;