From 9ef4e935c28de5c1936a0ac2529708f2541ab4a0 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 21 Jul 2014 16:47:51 +0100 Subject: 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 --- drivers/mfd/kempld-core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'drivers/mfd') 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 @@ #define MAX_ID_LEN 4 static char force_device_id[MAX_ID_LEN + 1] = ""; -module_param_string(force_device_id, force_device_id, sizeof(force_device_id), 0); +module_param_string(force_device_id, force_device_id, + sizeof(force_device_id), 0); MODULE_PARM_DESC(force_device_id, "Override detected product"); /* @@ -36,7 +37,7 @@ static void kempld_get_hardware_mutex(struct kempld_device_data *pld) { /* The mutex bit will read 1 until access has been granted */ while (ioread8(pld->io_index) & KEMPLD_MUTEX_KEY) - msleep(1); + usleep_range(1000, 3000); } static void kempld_release_hardware_mutex(struct kempld_device_data *pld) @@ -499,7 +500,7 @@ static struct platform_driver kempld_driver = { .remove = kempld_remove, }; -static struct dmi_system_id __initdata kempld_dmi_table[] = { +static struct dmi_system_id kempld_dmi_table[] __initdata = { { .ident = "BHL6", .matches = { @@ -736,7 +737,8 @@ static int __init kempld_init(void) int ret; if (force_device_id[0]) { - for (id = kempld_dmi_table; id->matches[0].slot != DMI_NONE; id++) + for (id = kempld_dmi_table; + id->matches[0].slot != DMI_NONE; id++) if (strstr(id->ident, force_device_id)) if (id->callback && id->callback(id)) break; -- cgit v1.2.3