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

Commit 8b9733c1 authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192e: Eliminate use of MSECS macro 



Use msecs_to_jiffies instead of driver specific macro
MSECS. This is done using Coccinelle and semantic
patch used for this is as follows:

@@expression t;@@

- MSECS(t)
+ msecs_to_jiffies(t)

Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 453ce99c

drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) 
	u32		CPU_status = 0;

	u32		CPU_status = 0;

	unsigned long   timeout;

	unsigned long   timeout;





	timeout = jiffies + MSECS(200);

	timeout = jiffies + msecs_to_jiffies(200);

	while (time_before(jiffies, timeout)) {

	while (time_before(jiffies, timeout)) {

		CPU_status = read_nic_dword(dev, CPU_GEN);

		CPU_status = read_nic_dword(dev, CPU_GEN);

		if (CPU_status & CPU_GEN_PUT_CODE_OK)

		if (CPU_status & CPU_GEN_PUT_CODE_OK)
@@ -128,7 +128,7 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) 
		       (u8)((CPU_status|CPU_GEN_PWR_STB_CPU)&0xff));

		       (u8)((CPU_status|CPU_GEN_PWR_STB_CPU)&0xff));

	mdelay(1);

	mdelay(1);





	timeout = jiffies + MSECS(200);

	timeout = jiffies + msecs_to_jiffies(200);

	while (time_before(jiffies, timeout)) {

	while (time_before(jiffies, timeout)) {

		CPU_status = read_nic_dword(dev, CPU_GEN);

		CPU_status = read_nic_dword(dev, CPU_GEN);

		if (CPU_status&CPU_GEN_BOOT_RDY)

		if (CPU_status&CPU_GEN_BOOT_RDY)
@@ -156,7 +156,7 @@ static bool CPUcheck_firmware_ready(struct net_device *dev) 
	u32	CPU_status = 0;

	u32	CPU_status = 0;

	unsigned long timeout;

	unsigned long timeout;





	timeout = jiffies + MSECS(20);

	timeout = jiffies + msecs_to_jiffies(20);

	while (time_before(jiffies, timeout)) {

	while (time_before(jiffies, timeout)) {

		CPU_status = read_nic_dword(dev, CPU_GEN);

		CPU_status = read_nic_dword(dev, CPU_GEN);

		if (CPU_status&CPU_GEN_FIRM_RDY)

		if (CPU_status&CPU_GEN_FIRM_RDY)

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1793,7 +1793,7 @@ void watch_dog_timer_callback(unsigned long data) 




	queue_delayed_work_rsl(priv->priv_wq, &priv->watch_dog_wq, 0);

	queue_delayed_work_rsl(priv->priv_wq, &priv->watch_dog_wq, 0);

	mod_timer(&priv->watch_dog_timer, jiffies +

	mod_timer(&priv->watch_dog_timer, jiffies +

		  MSECS(RTLLIB_WATCH_DOG_TIME));

		  msecs_to_jiffies(RTLLIB_WATCH_DOG_TIME));

}

}





/****************************************************************************

/****************************************************************************
@@ -3106,7 +3106,7 @@ void check_rfctrl_gpio_timer(unsigned long data) 
	queue_delayed_work_rsl(priv->priv_wq, &priv->gpio_change_rf_wq, 0);

	queue_delayed_work_rsl(priv->priv_wq, &priv->gpio_change_rf_wq, 0);





	mod_timer(&priv->gpio_polling_timer, jiffies +

	mod_timer(&priv->gpio_polling_timer, jiffies +

		  MSECS(RTLLIB_WATCH_DOG_TIME));

		  msecs_to_jiffies(RTLLIB_WATCH_DOG_TIME));

}

}





/***************************************************************************

/***************************************************************************

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2665,14 +2665,14 @@ void dm_fsync_timer_callback(unsigned long data) 
			if (timer_pending(&priv->fsync_timer))

			if (timer_pending(&priv->fsync_timer))

				del_timer_sync(&priv->fsync_timer);

				del_timer_sync(&priv->fsync_timer);

			priv->fsync_timer.expires = jiffies +

			priv->fsync_timer.expires = jiffies +

				 MSECS(priv->rtllib->fsync_time_interval *

				 msecs_to_jiffies(priv->rtllib->fsync_time_interval *

				 priv->rtllib->fsync_multiple_timeinterval);

				 priv->rtllib->fsync_multiple_timeinterval);

			add_timer(&priv->fsync_timer);

			add_timer(&priv->fsync_timer);

		} else {

		} else {

			if (timer_pending(&priv->fsync_timer))

			if (timer_pending(&priv->fsync_timer))

				del_timer_sync(&priv->fsync_timer);

				del_timer_sync(&priv->fsync_timer);

			priv->fsync_timer.expires = jiffies +

			priv->fsync_timer.expires = jiffies +

				 MSECS(priv->rtllib->fsync_time_interval);

				 msecs_to_jiffies(priv->rtllib->fsync_time_interval);

			add_timer(&priv->fsync_timer);

			add_timer(&priv->fsync_timer);

		}

		}

	} else {

	} else {
@@ -2762,7 +2762,7 @@ static void dm_StartSWFsync(struct net_device *dev) 
	if (timer_pending(&priv->fsync_timer))

	if (timer_pending(&priv->fsync_timer))

		del_timer_sync(&priv->fsync_timer);

		del_timer_sync(&priv->fsync_timer);

	priv->fsync_timer.expires = jiffies +

	priv->fsync_timer.expires = jiffies +

				    MSECS(priv->rtllib->fsync_time_interval);

				    msecs_to_jiffies(priv->rtllib->fsync_time_interval);

	add_timer(&priv->fsync_timer);

	add_timer(&priv->fsync_timer);





	write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cd);

	write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cd);

drivers/staging/rtl8192e/rtl8192e/rtl_ps.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -67,7 +67,8 @@ void rtl8192_hw_wakeup(struct net_device *dev) 
		RT_TRACE(COMP_DBG, "rtl8192_hw_wakeup(): RF Change in "

		RT_TRACE(COMP_DBG, "rtl8192_hw_wakeup(): RF Change in "

			 "progress!\n");

			 "progress!\n");

		queue_delayed_work_rsl(priv->rtllib->wq,

		queue_delayed_work_rsl(priv->rtllib->wq,

				       &priv->rtllib->hw_wakeup_wq, MSECS(10));

				       &priv->rtllib->hw_wakeup_wq,

				       msecs_to_jiffies(10));

		return;

		return;

	}

	}

	spin_unlock_irqrestore(&priv->rf_ps_lock, flags);

	spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
@@ -95,18 +96,18 @@ void rtl8192_hw_to_sleep(struct net_device *dev, u64 time) 




	spin_lock_irqsave(&priv->ps_lock, flags);

	spin_lock_irqsave(&priv->ps_lock, flags);





	time -= MSECS(8+16+7);

	time -= msecs_to_jiffies(8 + 16 + 7);





	if ((time - jiffies) <= MSECS(MIN_SLEEP_TIME)) {

	if ((time - jiffies) <= msecs_to_jiffies(MIN_SLEEP_TIME)) {

		spin_unlock_irqrestore(&priv->ps_lock, flags);

		spin_unlock_irqrestore(&priv->ps_lock, flags);

		printk(KERN_INFO "too short to sleep::%lld < %ld\n",

		printk(KERN_INFO "too short to sleep::%lld < %ld\n",

		       time - jiffies, MSECS(MIN_SLEEP_TIME));

		       time - jiffies, msecs_to_jiffies(MIN_SLEEP_TIME));

		return;

		return;

	}

	}





	if ((time - jiffies) > MSECS(MAX_SLEEP_TIME)) {

	if ((time - jiffies) > msecs_to_jiffies(MAX_SLEEP_TIME)) {

		printk(KERN_INFO "========>too long to sleep:%lld > %ld\n",

		printk(KERN_INFO "========>too long to sleep:%lld > %ld\n",

		       time - jiffies,  MSECS(MAX_SLEEP_TIME));

		       time - jiffies,  msecs_to_jiffies(MAX_SLEEP_TIME));

		spin_unlock_irqrestore(&priv->ps_lock, flags);

		spin_unlock_irqrestore(&priv->ps_lock, flags);

		return;

		return;

	}

	}

drivers/staging/rtl8192e/rtl819x_BAProc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ static void ActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA, 
{

{

	pBA->bValid = true;

	pBA->bValid = true;

	if (Time != 0)

	if (Time != 0)

		mod_timer(&pBA->Timer, jiffies + MSECS(Time));

		mod_timer(&pBA->Timer, jiffies + msecs_to_jiffies(Time));

}

}





static void DeActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA)

static void DeActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA)