Commit a9d5131e authored by Easwar Hariharan's avatar Easwar Hariharan Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_vhci: convert timeouts to secs_to_jiffies() 



Commit b35108a5 ("jiffies: Define secs_to_jiffies()") introduced
secs_to_jiffies().  As the value here is a multiple of 1000, use
secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication.

This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with
the following Coccinelle rules:

@depends on patch@
expression E;
@@

-msecs_to_jiffies(E * 1000)
+secs_to_jiffies(E)

-msecs_to_jiffies(E * MSEC_PER_SEC)
+secs_to_jiffies(E)

Signed-off-by: default avatarEaswar Hariharan <eahariha@linux.microsoft.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 5df5dafc

drivers/bluetooth/hci_vhci.c

+2 −2
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static inline void force_devcd_timeout(struct hci_dev *hdev, 
				       unsigned int timeout)

{

#ifdef CONFIG_DEV_COREDUMP

	hdev->dump.timeout = msecs_to_jiffies(timeout * 1000);

	hdev->dump.timeout = secs_to_jiffies(timeout);

#endif

}
@@ -645,7 +645,7 @@ static int vhci_open(struct inode *inode, struct file *file) 
	file->private_data = data;

	nonseekable_open(inode, file);



	schedule_delayed_work(&data->open_timeout, msecs_to_jiffies(1000));

	schedule_delayed_work(&data->open_timeout, secs_to_jiffies(1));



	return 0;

}