iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: bootrom: send timeout in milliseconds to gb_bootrom_set_timeout()

Browse Source 
Rename NEXT_REQ_TIMEOUT_J to NEXT_REQ_TIMEOUT_MS and store the timeout
in milliseconds instead of jiffies.

Suggested-by: Alex Elder <alex.elder@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Viresh Kumar 2016-06-22 14:46:40 +05:30 committed by Greg Kroah-Hartman
parent a4293e1d4e
commit dbb8cfeba9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/greybus/bootrom.c
View File

@ -15,7 +15,7 @@
#include "greybus.h"
/* Timeout, in jiffies, within which the next request must be received */
#define NEXT_REQ_TIMEOUT_J msecs_to_jiffies(1000)
#define NEXT_REQ_TIMEOUT_MS 1000
enum next_request_type {
NEXT_REQ_FIRMWARE_SIZE,
@ -82,7 +82,7 @@ static void gb_bootrom_set_timeout(struct gb_bootrom *bootrom,
enum next_request_type next, unsigned long timeout)
{
bootrom->next_request = next;
schedule_delayed_work(&bootrom->dwork, timeout);
schedule_delayed_work(&bootrom->dwork, msecs_to_jiffies(timeout));
}
/*
@ -211,7 +211,7 @@ unlock:
queue_work:
/* Refresh timeout */
gb_bootrom_set_timeout(bootrom, NEXT_REQ_GET_FIRMWARE,
NEXT_REQ_TIMEOUT_J);
NEXT_REQ_TIMEOUT_MS);
return ret;
}
@ -281,7 +281,7 @@ queue_work:
else
next_request = NEXT_REQ_GET_FIRMWARE;
gb_bootrom_set_timeout(bootrom, next_request, NEXT_REQ_TIMEOUT_J);
gb_bootrom_set_timeout(bootrom, next_request, NEXT_REQ_TIMEOUT_MS);
return ret;
}
@ -327,7 +327,7 @@ queue_work:
* connection. As that can take some time, increase the timeout a bit.
*/
gb_bootrom_set_timeout(bootrom, NEXT_REQ_MODE_SWITCH,
5 * NEXT_REQ_TIMEOUT_J);
5 * NEXT_REQ_TIMEOUT_MS);
return ret;
}
@ -447,7 +447,7 @@ static int gb_bootrom_probe(struct gb_bundle *bundle,
/* Refresh timeout */
gb_bootrom_set_timeout(bootrom, NEXT_REQ_FIRMWARE_SIZE,
NEXT_REQ_TIMEOUT_J);
NEXT_REQ_TIMEOUT_MS);
dev_dbg(&bundle->dev, "AP_READY sent\n");