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

Commit 6adc30b1 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: use msecs_to_jiffies in ks7010_rw_function function 



This commit replaces custom time calculations done in ks7010_rw_function
with msecs_to_jiffies() function which has the same behaviour.

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0ba53a4

drivers/staging/ks7010/ks7010_sdio.c

+4 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/mmc/sdio_func.h>

#include <linux/workqueue.h>

#include <linux/atomic.h>

#include <linux/jiffies.h>



#include "ks_wlan.h"

#include "ks_wlan_ioctl.h"
@@ -427,19 +428,18 @@ static void ks7010_rw_function(struct work_struct *work) 
	priv = container_of(work, struct ks_wlan_private, rw_dwork.work);



	/* wait after DOZE */

	if (time_after(priv->last_doze + ((30 * HZ) / 1000), jiffies)) {

	if (time_after(priv->last_doze + msecs_to_jiffies(30), jiffies)) {

		netdev_dbg(priv->net_dev, "wait after DOZE\n");

		queue_delayed_work(priv->wq, &priv->rw_dwork, 1);

		return;

	}



	/* wait after WAKEUP */

	while (time_after(priv->last_wakeup + ((30 * HZ) / 1000), jiffies)) {

	while (time_after(priv->last_wakeup + msecs_to_jiffies(30), jiffies)) {

		netdev_dbg(priv->net_dev, "wait after WAKEUP\n");

		dev_info(&priv->ks_sdio_card->func->dev,

			 "wake: %lu %lu\n",

			 priv->last_wakeup + (30 * HZ) / 1000,

				jiffies);

			 priv->last_wakeup + msecs_to_jiffies(30), jiffies);

		msleep(30);

	}