Commit 7583028d authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Thomas Zimmermann
Browse files

drm: gm12u320: Fix the timeout usage for usb_bulk_msg() 



The timeout arg of usb_bulk_msg() is ms already, which has been converted
to jiffies by msecs_to_jiffies() in usb_start_wait_urb(). So fix the usage
by removing the redundant msecs_to_jiffies() in the macros.

And as Hans suggested, also remove msecs_to_jiffies() for the IDLE_TIMEOUT
macro to make it consistent here and so change IDLE_TIMEOUT to
msecs_to_jiffies(IDLE_TIMEOUT) where it is used.

Fixes: e4f86e43 ("drm: Add Grain Media GM12U320 driver v2")
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Suggested-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230904021421.1663892-1-ruanjinjie@huawei.com
parent e2884fe8

drivers/gpu/drm/tiny/gm12u320.c

+5 −5
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@ MODULE_PARM_DESC(eco_mode, "Turn on Eco mode (less bright, more silent)"); 
#define READ_STATUS_SIZE		13

#define MISC_VALUE_SIZE			4



#define CMD_TIMEOUT			msecs_to_jiffies(200)

#define DATA_TIMEOUT			msecs_to_jiffies(1000)

#define IDLE_TIMEOUT			msecs_to_jiffies(2000)

#define FIRST_FRAME_TIMEOUT		msecs_to_jiffies(2000)

#define CMD_TIMEOUT			200

#define DATA_TIMEOUT			1000

#define IDLE_TIMEOUT			2000

#define FIRST_FRAME_TIMEOUT		2000



#define MISC_REQ_GET_SET_ECO_A		0xff

#define MISC_REQ_GET_SET_ECO_B		0x35
@@ -389,7 +389,7 @@ static void gm12u320_fb_update_work(struct work_struct *work) 
	 * switches back to showing its logo.

	 */

	queue_delayed_work(system_long_wq, &gm12u320->fb_update.work,

			   IDLE_TIMEOUT);

			   msecs_to_jiffies(IDLE_TIMEOUT));



	return;

err: