]> git.baikalelectronics.ru Git - kernel.git/commitdiff
platform/x86: intel_scu_ipc: Fix busy loop expiry time
authorPrashant Malani <pmalani@chromium.org>
Tue, 28 Sep 2021 10:19:30 +0000 (03:19 -0700)
committerHans de Goede <hdegoede@redhat.com>
Mon, 11 Oct 2021 13:34:39 +0000 (15:34 +0200)
The macro IPC_TIMEOUT is already in jiffies (it is also used like that
elsewhere in the file when calling wait_for_completion_timeout()). Don’t
convert it using helper functions for the purposes of calculating the
busy loop expiry time.

Fixes: e7b7ab3847c9 (“platform/x86: intel_scu_ipc: Sleeping is fine when polling”)
Signed-off-by: Prashant Malani <pmalani@chromium.org>
Cc: Benson Leung <bleung@chromium.org>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20210928101932.2543937-2-pmalani@chromium.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/platform/x86/intel_scu_ipc.c

index bfa0cc20750d3621996142917f62c6cf7dee48f2..cfb249da2a7bd05158000f0a3c776618d52406ac 100644 (file)
@@ -232,7 +232,7 @@ static inline u32 ipc_data_readl(struct intel_scu_ipc_dev *scu, u32 offset)
 /* Wait till scu status is busy */
 static inline int busy_loop(struct intel_scu_ipc_dev *scu)
 {
-       unsigned long end = jiffies + msecs_to_jiffies(IPC_TIMEOUT);
+       unsigned long end = jiffies + IPC_TIMEOUT;
 
        do {
                u32 status;