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

Commit 2d1aea8d authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by David S. Miller
Browse files

[SPARC]: sbus/vfc_i2c: remove sleep_on() usage 



Use wait-queue directly instead of the deprecated sleep_on()
function. This required adding a local wait-queue. Also use new (added in
separate patch to K-J) usecs to jiffies function to convert value.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb39d263

drivers/sbus/char/vfc_i2c.c

+5 −3
Original line number Diff line number Diff line
@@ -88,14 +88,16 @@ void vfc_i2c_delay_wakeup(struct vfc_dev *dev) 


void vfc_i2c_delay_no_busy(struct vfc_dev *dev, unsigned long usecs) 

{

	DEFINE_WAIT(wait);

	init_timer(&dev->poll_timer);

	dev->poll_timer.expires = jiffies + 

		((unsigned long)usecs*(HZ))/1000000;

	dev->poll_timer.expires = jiffies + usecs_to_jiffies(usecs);

	dev->poll_timer.data=(unsigned long)dev;

	dev->poll_timer.function=(void *)(unsigned long)vfc_i2c_delay_wakeup;

	add_timer(&dev->poll_timer);

	sleep_on(&dev->poll_wait);

	prepare_to_wait(&dev->poll_wait, &wait, TASK_UNINTERRUPTIBLE);

	schedule();

	del_timer(&dev->poll_timer);

	finish_wait(&dev->poll_wait, &wait);

}



void inline vfc_i2c_delay(struct vfc_dev *dev)