xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 7583028d359db3cd0072badcc576b4f9455fd27a ]

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: e4f86e4371 ("drm: Add Grain Media GM12U320 driver v2")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Suggested-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230904021421.1663892-1-ruanjinjie@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jinjie Ruan
2023-09-04 10:14:20 +08:00
committed by Greg Kroah-Hartman
parent df380d6f5c
commit 82910aa550
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/tiny/gm12u320.c
View File

@@ -67,10 +67,10 @@ MODULE_PARM_DESC(eco_mode, "Turn on Eco mode (less bright, more silent)");
#define READ_STATUS_SIZE 13 #define READ_STATUS_SIZE 13
#define MISC_VALUE_SIZE 4 #define MISC_VALUE_SIZE 4
#define CMD_TIMEOUT msecs_to_jiffies(200) #define CMD_TIMEOUT 200
#define DATA_TIMEOUT msecs_to_jiffies(1000) #define DATA_TIMEOUT 1000
#define IDLE_TIMEOUT msecs_to_jiffies(2000) #define IDLE_TIMEOUT 2000
#define FIRST_FRAME_TIMEOUT msecs_to_jiffies(2000) #define FIRST_FRAME_TIMEOUT 2000
#define MISC_REQ_GET_SET_ECO_A 0xff #define MISC_REQ_GET_SET_ECO_A 0xff
#define MISC_REQ_GET_SET_ECO_B 0x35 #define MISC_REQ_GET_SET_ECO_B 0x35
@@ -399,7 +399,7 @@ static void gm12u320_fb_update_work(struct work_struct *work)
* switches back to showing its logo. * switches back to showing its logo.
*/ */
queue_delayed_work(system_long_wq, &gm12u320->fb_update.work, queue_delayed_work(system_long_wq, &gm12u320->fb_update.work,
IDLE_TIMEOUT); msecs_to_jiffies(IDLE_TIMEOUT));
return; return;
err: err: