summaryrefslogtreecommitdiffstats
path: root/drivers/staging/fsl-mc/bus/mc-sys.c
diff options
context:
space:
mode:
authorJ. German Rivera2015-10-17 22:33:12 +0200
committerGreg Kroah-Hartman2015-10-18 05:54:46 +0200
commitc6a3363c13f43599919b82ef64ce32856d836e00 (patch)
tree0914fd61adbe7f08f34c49109683043d2e05c222 /drivers/staging/fsl-mc/bus/mc-sys.c
parentstaging: fsl-mc: Added missing initializer in fsl_mc_bus_driver (diff)
downloadkernel-qcow2-linux-c6a3363c13f43599919b82ef64ce32856d836e00.tar.gz
kernel-qcow2-linux-c6a3363c13f43599919b82ef64ce32856d836e00.tar.xz
kernel-qcow2-linux-c6a3363c13f43599919b82ef64ce32856d836e00.zip
staging: fsl-mc: changed timeout units for MC cmd completion
Changed units for the timeout to wait for completion of MC command, from jiffies to milliseconds. Signed-off-by: J. German Rivera <German.Rivera@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fsl-mc/bus/mc-sys.c')
-rw-r--r--drivers/staging/fsl-mc/bus/mc-sys.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/staging/fsl-mc/bus/mc-sys.c
index 07848a0cbe5a..2c5f1096e594 100644
--- a/drivers/staging/fsl-mc/bus/mc-sys.c
+++ b/drivers/staging/fsl-mc/bus/mc-sys.c
@@ -42,9 +42,9 @@
#include "dpmcp.h"
/**
- * Timeout in jiffies to wait for the completion of an MC command
+ * Timeout in milliseconds to wait for the completion of an MC command
*/
-#define MC_CMD_COMPLETION_TIMEOUT_JIFFIES (HZ / 2) /* 500 ms */
+#define MC_CMD_COMPLETION_TIMEOUT_MS 500
/*
* usleep_range() min and max values used to throttle down polling
@@ -305,7 +305,7 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd)
{
enum mc_cmd_status status;
unsigned long jiffies_until_timeout =
- jiffies + MC_CMD_COMPLETION_TIMEOUT_JIFFIES;
+ jiffies + msecs_to_jiffies(MC_CMD_COMPLETION_TIMEOUT_MS);
/*
* Send command to the MC hardware: