From: Krzysztof Kozlowski <krzk@kernel.org>
To: Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>,
Rob Herring <robh+dt@kernel.org>, Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Javier Martinez Canillas <javier@osg.samsung.com>,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org
Subject: [PATCH v2 1/8] watchdog: s3c2410: Remove confusing CONFIG prefix from local defines
Date: Sat, 11 Mar 2017 19:25:20 +0200 [thread overview]
Message-ID: <20170311172527.16368-2-krzk@kernel.org> (raw)
In-Reply-To: <20170311172527.16368-1-krzk@kernel.org>
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>
---
drivers/watchdog/s3c2410_wdt.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 59e95762a6de..3e216f54cb6f 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -64,8 +64,8 @@
#define S3C2410_WTCON_PRESCALE_MASK (0xff << 8)
#define S3C2410_WTCON_PRESCALE_MAX 0xff
-#define CONFIG_S3C2410_WATCHDOG_ATBOOT (0)
-#define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME (15)
+#define S3C2410_WATCHDOG_ATBOOT (0)
+#define S3C2410_WATCHDOG_DEFAULT_TIME (15)
#define EXYNOS5_RST_STAT_REG_OFFSET 0x0404
#define EXYNOS5_WDT_DISABLE_REG_OFFSET 0x0408
@@ -79,7 +79,7 @@
static bool nowayout = WATCHDOG_NOWAYOUT;
static int tmr_margin;
-static int tmr_atboot = CONFIG_S3C2410_WATCHDOG_ATBOOT;
+static int tmr_atboot = S3C2410_WATCHDOG_ATBOOT;
static int soft_noboot;
static int debug;
@@ -90,10 +90,10 @@ module_param(soft_noboot, int, 0);
module_param(debug, int, 0);
MODULE_PARM_DESC(tmr_margin, "Watchdog tmr_margin in seconds. (default="
- __MODULE_STRING(CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME) ")");
+ __MODULE_STRING(S3C2410_WATCHDOG_DEFAULT_TIME) ")");
MODULE_PARM_DESC(tmr_atboot,
"Watchdog is started at boot time if set to 1, default="
- __MODULE_STRING(CONFIG_S3C2410_WATCHDOG_ATBOOT));
+ __MODULE_STRING(S3C2410_WATCHDOG_ATBOOT));
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
MODULE_PARM_DESC(soft_noboot, "Watchdog action, set to 1 to ignore reboots, "
@@ -406,7 +406,7 @@ static struct watchdog_ops s3c2410wdt_ops = {
static struct watchdog_device s3c2410_wdd = {
.info = &s3c2410_wdt_ident,
.ops = &s3c2410wdt_ops,
- .timeout = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME,
+ .timeout = S3C2410_WATCHDOG_DEFAULT_TIME,
};
/* interrupt handler code */
@@ -600,12 +600,12 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
wdt->wdt_device.timeout);
if (ret) {
started = s3c2410wdt_set_heartbeat(&wdt->wdt_device,
- CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME);
+ S3C2410_WATCHDOG_DEFAULT_TIME);
if (started == 0)
dev_info(dev,
"tmr_margin value out of range, default %d used\n",
- CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME);
+ S3C2410_WATCHDOG_DEFAULT_TIME);
else
dev_info(dev, "default timer value is out of range, "
"cannot start\n");
--
2.9.3
next prev parent reply other threads:[~2017-03-11 17:25 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-11 17:25 [PATCH v2 0/8] watchdog: s3c2410: Fixes and improvements Krzysztof Kozlowski
2017-03-11 17:25 ` Krzysztof Kozlowski [this message]
[not found] ` <20170311172527.16368-2-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-11 17:28 ` [PATCH v2 1/8] watchdog: s3c2410: Remove confusing CONFIG prefix from local defines Krzysztof Kozlowski
2017-03-11 17:25 ` [PATCH v2 2/8] watchdog: s3c2410: Fix infinite interrupt in soft mode Krzysztof Kozlowski
2017-03-11 17:29 ` Krzysztof Kozlowski
2017-03-11 17:25 ` [PATCH v2 3/8] ARM: dts: exynos: Fix watchdog reset on Exynos4412 Krzysztof Kozlowski
[not found] ` <20170311172527.16368-4-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-12 20:48 ` Guenter Roeck
2017-03-13 6:41 ` Krzysztof Kozlowski
[not found] ` <CGME20170314130352epcas5p472cdaa4ae512b4a839d92e85d6dadb81@epcas5p4.samsung.com>
2017-03-14 13:03 ` Bartlomiej Zolnierkiewicz
2017-03-14 13:09 ` Krzysztof Kozlowski
[not found] ` <CGME20170314134503epcas1p178241245d202edf9f3ea5885c605ffb6@epcas1p1.samsung.com>
2017-03-14 13:45 ` Bartlomiej Zolnierkiewicz
[not found] ` <20170311172527.16368-1-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-11 17:25 ` [PATCH v2 4/8] ARM: dts: s3c64xx: Enable watchdog on all S3C64xx boards Krzysztof Kozlowski
[not found] ` <20170311172527.16368-5-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-12 20:49 ` Guenter Roeck
2017-03-14 12:58 ` Bartlomiej Zolnierkiewicz
2017-03-14 13:04 ` Krzysztof Kozlowski
[not found] ` <CGME20170314133035epcas1p47a04430402688bbb6baebad69b8e5b24@epcas1p4.samsung.com>
[not found] ` <CAJKOXPeCK1cjY78+PfcTprTnyXJ1k9zcUj8nW7onG8y0TWGzzQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-03-14 13:30 ` Bartlomiej Zolnierkiewicz
2017-03-14 13:34 ` Krzysztof Kozlowski
2017-03-11 17:25 ` [PATCH v2 5/8] ARM: dts: exynos: Enable watchdog on all Exynos4 boards Krzysztof Kozlowski
[not found] ` <20170311172527.16368-6-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-12 20:50 ` Guenter Roeck
2017-03-14 13:00 ` Bartlomiej Zolnierkiewicz
2017-03-11 17:25 ` [PATCH v2 6/8] ARM: dts: exynos: Fix infinite interrupt in soft mode on Exynos4210 and Exynos5440 Krzysztof Kozlowski
2017-03-12 20:50 ` Guenter Roeck
[not found] ` <CGME20170314130505epcas5p3ae5e356cfdf8b7b1d66256e47ea168ee@epcas5p3.samsung.com>
[not found] ` <20170311172527.16368-7-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-14 13:05 ` Bartlomiej Zolnierkiewicz
2017-03-11 17:25 ` [PATCH v2 7/8] ARM: dts: s3c64xx: Fix infinite interrupt in soft mode Krzysztof Kozlowski
[not found] ` <20170311172527.16368-8-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-12 20:51 ` Guenter Roeck
2017-03-14 13:07 ` Bartlomiej Zolnierkiewicz
2017-03-11 17:25 ` [PATCH v2 8/8] ARM: dts: s5pv210: " Krzysztof Kozlowski
2017-03-12 20:51 ` Guenter Roeck
[not found] ` <CGME20170314130737epcas5p2acd94980f020d95f52ac53e3ca1eb258@epcas5p2.samsung.com>
2017-03-14 13:07 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170311172527.16368-2-krzk@kernel.org \
--to=krzk@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=javier@osg.samsung.com \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=robh+dt@kernel.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).