summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2017-02-24 10:11:15 -0500
committerGuenter Roeck <linux@roeck-us.net>2017-02-24 17:00:23 -0500
commit4f21195d42ef930f20e1753532709bb294aa73ac (patch)
tree38d8a7bee64683cf50152e12aab3215ff9b70fab /drivers/watchdog
parent4cbc69023a2129c271ed67da555d62eca42469d2 (diff)
watchdog: s3c2410: Remove confusing CONFIG prefix from local defines
The CONFIG prefix from defines in the s3c2410_wdt.c might suggest that these constants come from Kconfig. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/s3c2410_wdt.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index d48ba2590641..b305b8717d9f 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -64,8 +64,8 @@
64#define S3C2410_WTCON_PRESCALE_MASK (0xff << 8) 64#define S3C2410_WTCON_PRESCALE_MASK (0xff << 8)
65#define S3C2410_WTCON_PRESCALE_MAX 0xff 65#define S3C2410_WTCON_PRESCALE_MAX 0xff
66 66
67#define CONFIG_S3C2410_WATCHDOG_ATBOOT (0) 67#define S3C2410_WATCHDOG_ATBOOT (0)
68#define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME (15) 68#define S3C2410_WATCHDOG_DEFAULT_TIME (15)
69 69
70#define EXYNOS5_RST_STAT_REG_OFFSET 0x0404 70#define EXYNOS5_RST_STAT_REG_OFFSET 0x0404
71#define EXYNOS5_WDT_DISABLE_REG_OFFSET 0x0408 71#define EXYNOS5_WDT_DISABLE_REG_OFFSET 0x0408
@@ -79,7 +79,7 @@
79 79
80static bool nowayout = WATCHDOG_NOWAYOUT; 80static bool nowayout = WATCHDOG_NOWAYOUT;
81static int tmr_margin; 81static int tmr_margin;
82static int tmr_atboot = CONFIG_S3C2410_WATCHDOG_ATBOOT; 82static int tmr_atboot = S3C2410_WATCHDOG_ATBOOT;
83static int soft_noboot; 83static int soft_noboot;
84static int debug; 84static int debug;
85 85
@@ -90,10 +90,10 @@ module_param(soft_noboot, int, 0);
90module_param(debug, int, 0); 90module_param(debug, int, 0);
91 91
92MODULE_PARM_DESC(tmr_margin, "Watchdog tmr_margin in seconds. (default=" 92MODULE_PARM_DESC(tmr_margin, "Watchdog tmr_margin in seconds. (default="
93 __MODULE_STRING(CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME) ")"); 93 __MODULE_STRING(S3C2410_WATCHDOG_DEFAULT_TIME) ")");
94MODULE_PARM_DESC(tmr_atboot, 94MODULE_PARM_DESC(tmr_atboot,
95 "Watchdog is started at boot time if set to 1, default=" 95 "Watchdog is started at boot time if set to 1, default="
96 __MODULE_STRING(CONFIG_S3C2410_WATCHDOG_ATBOOT)); 96 __MODULE_STRING(S3C2410_WATCHDOG_ATBOOT));
97MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 97MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
98 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 98 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
99MODULE_PARM_DESC(soft_noboot, "Watchdog action, set to 1 to ignore reboots, " 99MODULE_PARM_DESC(soft_noboot, "Watchdog action, set to 1 to ignore reboots, "
@@ -406,7 +406,7 @@ static const struct watchdog_ops s3c2410wdt_ops = {
406static struct watchdog_device s3c2410_wdd = { 406static struct watchdog_device s3c2410_wdd = {
407 .info = &s3c2410_wdt_ident, 407 .info = &s3c2410_wdt_ident,
408 .ops = &s3c2410wdt_ops, 408 .ops = &s3c2410wdt_ops,
409 .timeout = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME, 409 .timeout = S3C2410_WATCHDOG_DEFAULT_TIME,
410}; 410};
411 411
412/* interrupt handler code */ 412/* interrupt handler code */
@@ -600,12 +600,12 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
600 wdt->wdt_device.timeout); 600 wdt->wdt_device.timeout);
601 if (ret) { 601 if (ret) {
602 started = s3c2410wdt_set_heartbeat(&wdt->wdt_device, 602 started = s3c2410wdt_set_heartbeat(&wdt->wdt_device,
603 CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME); 603 S3C2410_WATCHDOG_DEFAULT_TIME);
604 604
605 if (started == 0) 605 if (started == 0)
606 dev_info(dev, 606 dev_info(dev,
607 "tmr_margin value out of range, default %d used\n", 607 "tmr_margin value out of range, default %d used\n",
608 CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME); 608 S3C2410_WATCHDOG_DEFAULT_TIME);
609 else 609 else
610 dev_info(dev, "default timer value is out of range, " 610 dev_info(dev, "default timer value is out of range, "
611 "cannot start\n"); 611 "cannot start\n");