| From ltsi-dev-bounces@lists.linuxfoundation.org Wed Nov 5 10:40:26 2014 |
| From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> |
| Date: Wed, 5 Nov 2014 09:39:20 +0800 |
| Subject: [LTSI-dev] [PATCH 15/16] watchdog: fix checkpatch warnings and error |
| To: LTSI Mailing List <ltsi-dev@lists.linuxfoundation.org> |
| Cc: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> |
| Message-ID: <1415151561-16047-16-git-send-email-rebecca.swee.fun.chang@intel.com> |
| |
| |
| From: Jingoo Han <jg1.han@samsung.com> |
| |
| Fix the following checkpatch warnings and error: |
| WARNING: quoted string split across lines |
| WARNING: braces {} are not necessary for single statement blocks |
| WARNING: __initdata should be placed after ibmasr_id_table[] |
| WARNING: please, no space before tabs |
| ERROR: do not initialise statics to 0 or NULL |
| |
| Signed-off-by: Jingoo Han <jg1.han@samsung.com> |
| Reviewed-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Wim Van Sebroeck <wim@iguana.be> |
| (cherry picked from commit 5f5e19093b2fa592720810154f15ffe51aa9277f) |
| |
| Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> |
| --- |
| drivers/watchdog/ep93xx_wdt.c | 6 +++--- |
| drivers/watchdog/iTCO_wdt.c | 6 +++--- |
| drivers/watchdog/ibmasr.c | 2 +- |
| drivers/watchdog/pc87413_wdt.c | 7 +++---- |
| drivers/watchdog/softdog.c | 2 +- |
| drivers/watchdog/w83697hf_wdt.c | 4 ++-- |
| 6 files changed, 13 insertions(+), 14 deletions(-) |
| |
| --- a/drivers/watchdog/ep93xx_wdt.c |
| +++ b/drivers/watchdog/ep93xx_wdt.c |
| @@ -172,9 +172,9 @@ static struct platform_driver ep93xx_wdt |
| |
| module_platform_driver(ep93xx_wdt_driver); |
| |
| -MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>," |
| - "Alessandro Zummo <a.zummo@towertech.it>," |
| - "H Hartley Sweeten <hsweeten@visionengravers.com>"); |
| +MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>"); |
| +MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); |
| +MODULE_AUTHOR("H Hartley Sweeten <hsweeten@visionengravers.com>"); |
| MODULE_DESCRIPTION("EP93xx Watchdog"); |
| MODULE_LICENSE("GPL"); |
| MODULE_VERSION(WDT_VERSION); |
| --- a/drivers/watchdog/iTCO_wdt.c |
| +++ b/drivers/watchdog/iTCO_wdt.c |
| @@ -370,15 +370,15 @@ static const struct watchdog_info ident |
| static const struct watchdog_ops iTCO_wdt_ops = { |
| .owner = THIS_MODULE, |
| .start = iTCO_wdt_start, |
| - .stop = iTCO_wdt_stop, |
| - .ping = iTCO_wdt_ping, |
| + .stop = iTCO_wdt_stop, |
| + .ping = iTCO_wdt_ping, |
| .set_timeout = iTCO_wdt_set_timeout, |
| .get_timeleft = iTCO_wdt_get_timeleft, |
| }; |
| |
| static struct watchdog_device iTCO_wdt_watchdog_dev = { |
| .info = &ident, |
| - .ops = &iTCO_wdt_ops, |
| + .ops = &iTCO_wdt_ops, |
| }; |
| |
| /* |
| --- a/drivers/watchdog/ibmasr.c |
| +++ b/drivers/watchdog/ibmasr.c |
| @@ -360,7 +360,7 @@ struct ibmasr_id { |
| int type; |
| }; |
| |
| -static struct ibmasr_id __initdata ibmasr_id_table[] = { |
| +static struct ibmasr_id ibmasr_id_table[] __initdata = { |
| { "IBM Automatic Server Restart - eserver xSeries 220", ASMTYPE_TOPAZ }, |
| { "IBM Automatic Server Restart - Machine Type 8673", ASMTYPE_PEARL }, |
| { "IBM Automatic Server Restart - Machine Type 8480", ASMTYPE_JASPER }, |
| --- a/drivers/watchdog/pc87413_wdt.c |
| +++ b/drivers/watchdog/pc87413_wdt.c |
| @@ -512,9 +512,8 @@ static int __init pc87413_init(void) |
| return -EBUSY; |
| |
| ret = register_reboot_notifier(&pc87413_notifier); |
| - if (ret != 0) { |
| + if (ret != 0) |
| pr_err("cannot register reboot notifier (err=%d)\n", ret); |
| - } |
| |
| ret = misc_register(&pc87413_miscdev); |
| if (ret != 0) { |
| @@ -575,8 +574,8 @@ static void __exit pc87413_exit(void) |
| module_init(pc87413_init); |
| module_exit(pc87413_exit); |
| |
| -MODULE_AUTHOR("Sven Anders <anders@anduras.de>, " |
| - "Marcus Junker <junker@anduras.de>,"); |
| +MODULE_AUTHOR("Sven Anders <anders@anduras.de>"); |
| +MODULE_AUTHOR("Marcus Junker <junker@anduras.de>"); |
| MODULE_DESCRIPTION("PC87413 WDT driver"); |
| MODULE_LICENSE("GPL"); |
| |
| --- a/drivers/watchdog/softdog.c |
| +++ b/drivers/watchdog/softdog.c |
| @@ -62,7 +62,7 @@ MODULE_PARM_DESC(nowayout, |
| "Watchdog cannot be stopped once started (default=" |
| __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
| |
| -static int soft_noboot = 0; |
| +static int soft_noboot; |
| module_param(soft_noboot, int, 0); |
| MODULE_PARM_DESC(soft_noboot, |
| "Softdog action, set to 1 to ignore reboots, 0 to reboot (default=0)"); |
| --- a/drivers/watchdog/w83697hf_wdt.c |
| +++ b/drivers/watchdog/w83697hf_wdt.c |
| @@ -455,6 +455,6 @@ module_init(wdt_init); |
| module_exit(wdt_exit); |
| |
| MODULE_LICENSE("GPL"); |
| -MODULE_AUTHOR("Marcus Junker <junker@anduras.de>, " |
| - "Samuel Tardieu <sam@rfc1149.net>"); |
| +MODULE_AUTHOR("Marcus Junker <junker@anduras.de>"); |
| +MODULE_AUTHOR("Samuel Tardieu <sam@rfc1149.net>"); |
| MODULE_DESCRIPTION("w83697hf/hg WDT driver"); |