diff options
author | Lee Jones <lee.jones@linaro.org> | 2014-07-21 11:47:51 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-07-25 10:31:45 -0400 |
commit | 9ef4e935c28de5c1936a0ac2529708f2541ab4a0 (patch) | |
tree | 465190043206b5a9d4209d3dadb4f26002d772a8 /drivers/mfd | |
parent | 9336fe9104120688dc61fdc3d74a123c49ff5ea2 (diff) |
mfd: kempld-core: Correct a variety of checkpatch warnings
WARNING: line over 80 characters
+module_param_string(force_device_id, force_device_id, sizeof(force_device_id), 0);
WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt
+ msleep(1);
WARNING: __initdata should be placed after kempld_dmi_table[]
+static struct dmi_system_id __initdata kempld_dmi_table[] = {
WARNING: line over 80 characters
+ for (id = kempld_dmi_table; id->matches[0].slot != DMI_NONE; id++)
total: 0 errors, 4 warnings, 771 lines checked
This is part of an effort to clean-up the MFD subsystem.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/kempld-core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c index f7ff0188603d..bd2696136eee 100644 --- a/drivers/mfd/kempld-core.c +++ b/drivers/mfd/kempld-core.c | |||
@@ -24,7 +24,8 @@ | |||
24 | 24 | ||
25 | #define MAX_ID_LEN 4 | 25 | #define MAX_ID_LEN 4 |
26 | static char force_device_id[MAX_ID_LEN + 1] = ""; | 26 | static char force_device_id[MAX_ID_LEN + 1] = ""; |
27 | module_param_string(force_device_id, force_device_id, sizeof(force_device_id), 0); | 27 | module_param_string(force_device_id, force_device_id, |
28 | sizeof(force_device_id), 0); | ||
28 | MODULE_PARM_DESC(force_device_id, "Override detected product"); | 29 | MODULE_PARM_DESC(force_device_id, "Override detected product"); |
29 | 30 | ||
30 | /* | 31 | /* |
@@ -36,7 +37,7 @@ static void kempld_get_hardware_mutex(struct kempld_device_data *pld) | |||
36 | { | 37 | { |
37 | /* The mutex bit will read 1 until access has been granted */ | 38 | /* The mutex bit will read 1 until access has been granted */ |
38 | while (ioread8(pld->io_index) & KEMPLD_MUTEX_KEY) | 39 | while (ioread8(pld->io_index) & KEMPLD_MUTEX_KEY) |
39 | msleep(1); | 40 | usleep_range(1000, 3000); |
40 | } | 41 | } |
41 | 42 | ||
42 | static void kempld_release_hardware_mutex(struct kempld_device_data *pld) | 43 | static void kempld_release_hardware_mutex(struct kempld_device_data *pld) |
@@ -499,7 +500,7 @@ static struct platform_driver kempld_driver = { | |||
499 | .remove = kempld_remove, | 500 | .remove = kempld_remove, |
500 | }; | 501 | }; |
501 | 502 | ||
502 | static struct dmi_system_id __initdata kempld_dmi_table[] = { | 503 | static struct dmi_system_id kempld_dmi_table[] __initdata = { |
503 | { | 504 | { |
504 | .ident = "BHL6", | 505 | .ident = "BHL6", |
505 | .matches = { | 506 | .matches = { |
@@ -736,7 +737,8 @@ static int __init kempld_init(void) | |||
736 | int ret; | 737 | int ret; |
737 | 738 | ||
738 | if (force_device_id[0]) { | 739 | if (force_device_id[0]) { |
739 | for (id = kempld_dmi_table; id->matches[0].slot != DMI_NONE; id++) | 740 | for (id = kempld_dmi_table; |
741 | id->matches[0].slot != DMI_NONE; id++) | ||
740 | if (strstr(id->ident, force_device_id)) | 742 | if (strstr(id->ident, force_device_id)) |
741 | if (id->callback && id->callback(id)) | 743 | if (id->callback && id->callback(id)) |
742 | break; | 744 | break; |