watchdog: s3c2410: Use dev_dbg instead of pr_info
Subsystems (2)
Krzysztof Kozlowski
maintainerPATCH 1/7 watchdog: s3c2410: Use dev_dbg instead of pr_info
Replace the 'debug' module parameter and pr_info() with proper device dynamic debug calls because this is the preferred and flexible way of enabling debugging printks.
Also remove some obvious debug printks.
--- drivers/watchdog/s3c2410_wdt.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-)
drivers/watchdog/s3c2410_wdt.c +6 -23
@@ -23,8 +23,6 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h>
@@ -83,13 +81,11 @@ static bool nowayout = WATCHDOG_NOWAYOUT;static int tmr_margin;static int tmr_atboot =S3C2410_WATCHDOG_ATBOOT ;static int soft_noboot; -static int debug;module_param (tmr_margin, int,0 );module_param (tmr_atboot, int,0 );module_param (nowayout, bool,0 );module_param (soft_noboot, int,0 ); -module_param (debug, int,0 ); MODULE_PARM_DESC(tmr_margin, "Watchdog tmr_margin in seconds. (default=" __MODULE_STRING(S3C2410_WATCHDOG_DEFAULT_TIME) ")");
@@ -100,7 +96,6 @@ 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, " "0 to reboot (default 0)" ); -MODULE_PARM_DESC (debug,"Watchdog debug, set to >1 for debug (default 0)" );/** * struct s3c2410_wdt_variant - Per-variant config data
@@ -204,14 +199,6 @@ static const struct platform_device_id s3c2410_wdt_ids[] = { };MODULE_DEVICE_TABLE (platform, s3c2410_wdt_ids); -/* watchdog control routines */ - -#define DBG (fmt, ...) \ -do { \ - if (debug) \ - pr_info(fmt, ##__VA_ARGS__); \ -} while (0) -/* functions */ static inline unsigned int s3c2410wdt_max_timeout (struct clk *clock)
@@ -307,8 +294,8 @@ static int s3c2410wdt_start(struct watchdog_device *wdd) wtcon |=S3C2410_WTCON_RSTEN ; } -DBG ("%s: count=0x%08x, wtcon=%08lx\n" , - __func__, wdt->count, wtcon); +dev_dbg (wdt->dev,"Starting watchdog: count=0x%08x, wtcon=%08lx\n" , + wdt->count, wtcon);writel (wdt->count, wdt->reg_base +S3C2410_WTDAT );writel (wdt->count, wdt->reg_base +S3C2410_WTCNT );
@@ -337,8 +324,8 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou freq =DIV_ROUND_UP (freq,128 ); count = timeout * freq; -DBG ("%s: count=%d, timeout=%d, freq=%lu\n" , - __func__, count, timeout, freq); +dev_dbg (wdt->dev,"Heartbeat: count=%d, timeout=%d, freq=%lu\n" , + count, timeout, freq);/* if the count is bigger than the watchdog register, then work out what we need to do (and if) we can
@@ -354,8 +341,8 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou } } -DBG ("%s: timeout=%d, divisor=%d, count=%d (%08x)\n" , - __func__, timeout, divisor, count,DIV_ROUND_UP (count, divisor)); +dev_dbg (wdt->dev,"Heartbeat: timeout=%d, divisor=%d, count=%d (%08x)\n" , + timeout, divisor, count,DIV_ROUND_UP (count, divisor)); count =DIV_ROUND_UP (count, divisor); wdt->count = count;
@@ -544,8 +531,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev)int started =0 ;int ret; -DBG ("%s: probe=%p\n" , __func__, pdev); - dev = &pdev->dev; wdt =devm_kzalloc (dev,sizeof (*wdt),GFP_KERNEL );
@@ -581,8 +566,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev) goto err; } -DBG ("probe: mapped reg_base=%p\n" , wdt->reg_base); - wdt->clock =devm_clk_get (dev,"watchdog" );if (IS_ERR (wdt->clock)) {dev_err (dev,"failed to find watchdog clock source\n" );
Signature · 1 line
2.9.3
Krzysztof Kozlowski
maintainerPATCH 2/7 watchdog: s3c2410: Select MFD_SYSCON on all Exynos platforms
Syscon is used not only on Exynos5 SoCs but also on Exynos3250, Exynos4412 and ARMv8 versions (Exynos5433, Exynos7).
--- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/Kconfig +1 -1
@@ -335,7 +335,7 @@ config S3C2410_WATCHDOG tristate "S3C2410 Watchdog" depends on HAVE_S3C2410_WATCHDOG select WATCHDOG_CORE - select MFD_SYSCON if ARCH_EXYNOS5 + select MFD_SYSCON if ARCH_EXYNOS help Watchdog timer block in the Samsung SoCs. This will reboot the system when the timer expires with the watchdog enabled.
Signature · 1 line
2.9.3
Re: [PATCH 2/7] watchdog: s3c2410: Select MFD_SYSCON on all Exynos platforms
Quoted 4 lines · Krzysztof Kozlowski
Syscon is used not only on Exynos5 SoCs but also on Exynos3250, Exynos4412 and ARMv8 versions (Exynos5433, Exynos7).
Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 18 lines
--- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/watchdog/Kconfig +1
-1@@ -335,7 +335,7 @@ config S3C2410_WATCHDOG tristate "S3C2410 Watchdog" depends on HAVE_S3C2410_WATCHDOG select WATCHDOG_CORE - select MFD_SYSCON if ARCH_EXYNOS5 + select MFD_SYSCON if ARCH_EXYNOS help Watchdog timer block in the Samsung SoCs. This will reboot the system when the timer expires with the watchdog enabled.
Krzysztof Kozlowski
maintainerPATCH 3/7 watchdog: s3c2410: Enable COMPILE_TEST
In reply to Krzysztof KozlowskiDriver can be compile tested on other architectures as well so use it to increase build coverage.
--- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/Kconfig +1 -1
@@ -333,7 +333,7 @@ config HAVE_S3C2410_WATCHDOG config S3C2410_WATCHDOG tristate "S3C2410 Watchdog" - depends on HAVE_S3C2410_WATCHDOG + depends on HAVE_S3C2410_WATCHDOG || COMPILE_TEST select WATCHDOG_CORE select MFD_SYSCON if ARCH_EXYNOS help
Signature · 1 line
2.9.3
Guenter Roeck
maintainerRe: [PATCH 3/7] watchdog: s3c2410: Enable COMPILE_TEST
Quoted 4 lines · Krzysztof Kozlowski
Driver can be compile tested on other architectures as well so use it to increase build coverage.
Signed-off-by Krzysztof Kozlowski <[email protected]>
Already submitted as part of 'watchdog: Enable COMPILE_TEST where possible'.
Quoted 18 lines
--- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/watchdog/Kconfig +1
-1@@ -333,7 +333,7 @@ config HAVE_S3C2410_WATCHDOG config S3C2410_WATCHDOG tristate "S3C2410 Watchdog" - depends on HAVE_S3C2410_WATCHDOG + depends on HAVE_S3C2410_WATCHDOG || COMPILE_TEST select WATCHDOG_CORE select MFD_SYSCON if ARCH_EXYNOS help
Krzysztof Kozlowski
maintainerPATCH 4/7 watchdog: s3c2410: Add prefix to local function
In reply to Krzysztof KozlowskiFunctions marked static inline might not be inlined so a driver-specific prefix for function name helps when looking through call backtrace.
--- drivers/watchdog/s3c2410_wdt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/watchdog/s3c2410_wdt.c +2 -3
@@ -507,9 +507,8 @@ static inline unsigned int s3c2410wdt_get_bootstatus(struct s3c2410_wdt *wdt)return 0 ; } -/* s3c2410_get_wdt_driver_data */ static inline struct s3c2410_wdt_variant * -get_wdt_drv_data (struct platform_device *pdev) +s3c2410_get_wdt_drv_data (struct platform_device *pdev) {if (pdev->dev.of_node) {const struct of_device_id *match;
@@ -541,7 +540,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)spin_lock_init (&wdt->lock); wdt->wdt_device = s3c2410_wdd; - wdt->drv_data =get_wdt_drv_data (pdev); + wdt->drv_data =s3c2410_get_wdt_drv_data (pdev);if (wdt->drv_data->quirks &QUIRKS_HAVE_PMUREG ) { wdt->pmureg =syscon_regmap_lookup_by_phandle (dev->of_node,"samsung,syscon-phandle" );
Signature · 1 line
2.9.3
Re: [PATCH 4/7] watchdog: s3c2410: Add prefix to local function
Quoted 4 lines · Krzysztof Kozlowski
Functions marked static inline might not be inlined so a driver-specific prefix for function name helps when looking through call backtrace.
Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 29 lines
--- drivers/watchdog/s3c2410_wdt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/watchdog/s3c2410_wdt.c +2
-3@@ -507,9 +507,8 @@ static inline unsigned int s3c2410wdt_get_bootstatus(struct s3c2410_wdt *wdt)return 0 ; } -/* s3c2410_get_wdt_driver_data */ static inline struct s3c2410_wdt_variant * -get_wdt_drv_data (struct platform_device *pdev) +s3c2410_get_wdt_drv_data (struct platform_device *pdev) {if (pdev->dev.of_node) {const struct of_device_id *match;@@ -541,7 +540,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)spin_lock_init (&wdt->lock); wdt->wdt_device = s3c2410_wdd; - wdt->drv_data =get_wdt_drv_data (pdev); + wdt->drv_data =s3c2410_get_wdt_drv_data (pdev);if (wdt->drv_data->quirks &QUIRKS_HAVE_PMUREG ) { wdt->pmureg =syscon_regmap_lookup_by_phandle (dev->of_node,"samsung,syscon-phandle" );
Krzysztof Kozlowski
maintainerPATCH 5/7 watchdog: s3c2410: Constify local structures
In reply to Krzysztof KozlowskiStructures watchdog_device, watchdog_ops and s3c2410_wdt_variant are not modified so they can be made const to increase code safeness.
--- drivers/watchdog/s3c2410_wdt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/watchdog/s3c2410_wdt.c +6 -6
@@ -131,7 +131,7 @@ struct s3c2410_wdt {unsigned long wtdat_save;struct watchdog_device wdt_device;struct notifier_block freq_transition; -struct s3c2410_wdt_variant *drv_data; +const struct s3c2410_wdt_variant *drv_data;struct regmap *pmureg; };
@@ -392,7 +392,7 @@ static const struct watchdog_info s3c2410_wdt_ident = { .identity = "S3C2410 Watchdog", }; -static struct watchdog_ops s3c2410wdt_ops = { +static const struct watchdog_ops s3c2410wdt_ops = { .owner =THIS_MODULE , .start = s3c2410wdt_start, .stop = s3c2410wdt_stop,
@@ -401,7 +401,7 @@ static struct watchdog_ops s3c2410wdt_ops = { .restart = s3c2410wdt_restart, }; -static struct watchdog_device s3c2410_wdd = { +static const struct watchdog_device s3c2410_wdd = { .info = &s3c2410_wdt_ident, .ops = &s3c2410wdt_ops, .timeout =S3C2410_WATCHDOG_DEFAULT_TIME ,
@@ -507,15 +507,15 @@ static inline unsigned int s3c2410wdt_get_bootstatus(struct s3c2410_wdt *wdt)return 0 ; } -static inline struct s3c2410_wdt_variant * +static inline const struct s3c2410_wdt_variant *s3c2410_get_wdt_drv_data (struct platform_device *pdev) {if (pdev->dev.of_node) {const struct of_device_id *match; match =of_match_node (s3c2410_wdt_match, pdev->dev.of_node); -return (struct s3c2410_wdt_variant *)match->data; +return (const struct s3c2410_wdt_variant *)match->data; }else { -return (struct s3c2410_wdt_variant *) +return (const struct s3c2410_wdt_variant *)platform_get_device_id (pdev)->driver_data; } }
Signature · 1 line
2.9.3
Guenter Roeck
maintainerRe: [PATCH 5/7] watchdog: s3c2410: Constify local structures
Quoted 4 lines · Krzysztof Kozlowski
Structures
watchdog_device,watchdog_opsands3c2410_wdt_variantare not modified so they can be made const to increase code safeness.Signed-off-by Krzysztof Kozlowski <[email protected]>
Conflicts with "watchdog: constify watchdog_ops structures" in my tree. I rebased my tree to v4.10 (which I should not really have done ;-), but it still doesn't apply due to "fatal: sha1 information is lacking or useless" and "error: could not build fake ancestor". The subsequent patches also don't apply. You may have to wait until after -rc1, rebase your patches, and resubmit.
Guenter
Quoted 55 lines
--- drivers/watchdog/s3c2410_wdt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/watchdog/s3c2410_wdt.c +6
-6@@ -131,7 +131,7 @@ struct s3c2410_wdt {unsigned long wtdat_save;struct watchdog_device wdt_device;struct notifier_block freq_transition; -struct s3c2410_wdt_variant *drv_data; +const struct s3c2410_wdt_variant *drv_data;struct regmap *pmureg; };@@ -392,7 +392,7 @@ static const struct watchdog_info s3c2410_wdt_ident = { .identity = "S3C2410 Watchdog", }; -static struct watchdog_ops s3c2410wdt_ops = { +static const struct watchdog_ops s3c2410wdt_ops = { .owner =THIS_MODULE , .start = s3c2410wdt_start, .stop = s3c2410wdt_stop,@@ -401,7 +401,7 @@ static struct watchdog_ops s3c2410wdt_ops = { .restart = s3c2410wdt_restart, }; -static struct watchdog_device s3c2410_wdd = { +static const struct watchdog_device s3c2410_wdd = { .info = &s3c2410_wdt_ident, .ops = &s3c2410wdt_ops, .timeout =S3C2410_WATCHDOG_DEFAULT_TIME ,@@ -507,15 +507,15 @@ static inline unsigned int s3c2410wdt_get_bootstatus(struct s3c2410_wdt *wdt)return 0 ; } -static inline struct s3c2410_wdt_variant * +static inline const struct s3c2410_wdt_variant *s3c2410_get_wdt_drv_data (struct platform_device *pdev) {if (pdev->dev.of_node) {const struct of_device_id *match; match =of_match_node (s3c2410_wdt_match, pdev->dev.of_node); -return (struct s3c2410_wdt_variant *)match->data; +return (const struct s3c2410_wdt_variant *)match->data; }else { -return (struct s3c2410_wdt_variant *) +return (const struct s3c2410_wdt_variant *)platform_get_device_id (pdev)->driver_data; } }
Krzysztof Kozlowski
maintainerRe: [PATCH 5/7] watchdog: s3c2410: Constify local structures
Quoted 4 lines · Guenter Roeck
Quoted 3 lines · Krzysztof Kozlowski
Structures
watchdog_device,watchdog_opsands3c2410_wdt_variantare not modified so they can be made const to increase code safeness.
Quoted 8 lines
Quoted 1 line
Signed-off-by Krzysztof Kozlowski <[email protected]>Conflicts with "watchdog: constify
watchdog_opsstructures" in my tree. I rebased my tree to v4.10 (which I should not really have done ;-), but it still doesn't apply due to "fatal: sha1 information is lacking or useless" and "error: could not build fake ancestor". The subsequent patches also don't apply. You may have to wait until after -rc1, rebase your patches, and resubmit.
Sure, I'll resend after merge window. These aren't important fixes so there is no problem in waiting for merge window to end.
Thanks for reviews.
Best regards,
Krzysztof
Guenter Roeck
maintainerRe: [PATCH 5/7] watchdog: s3c2410: Constify local structures
Quoted 14 lines · Krzysztof Kozlowski
Quoted 4 lines · Guenter Roeck
Quoted 3 lines · Krzysztof Kozlowski
Structures
watchdog_device,watchdog_opsands3c2410_wdt_variantare not modified so they can be made const to increase code safeness.Quoted 8 lines
Quoted 1 line
Signed-off-by Krzysztof Kozlowski <[email protected]>Conflicts with "watchdog: constify
watchdog_opsstructures" in my tree. I rebased my tree to v4.10 (which I should not really have done ;-), but it still doesn't apply due to "fatal: sha1 information is lacking or useless" and "error: could not build fake ancestor". The subsequent patches also don't apply. You may have to wait until after -rc1, rebase your patches, and resubmit.
Quoted 3 lines
Sure, I'll resend after merge window. These aren't important fixes so there is no problem in waiting for merge window to end.
Watchdog patches are in, so please feel free to resubmit at your convenience.
Thanks,
Guenter
Krzysztof Kozlowski
maintainerPATCH 6/7 watchdog: s3c2410: Simplify getting driver data
In reply to Krzysztof KozlowskiSimplify the flow in helper function for getting the driver data by using of_device_get_match_data() and only one if() branch.
The code should be equivalent.
--- drivers/watchdog/s3c2410_wdt.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/watchdog/s3c2410_wdt.c +10 -7
@@ -37,6 +37,7 @@#include <linux/slab.h> #include <linux/err.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/mfd/syscon.h> #include <linux/regmap.h> #include <linux/delay.h>
@@ -510,14 +511,16 @@ static inline unsigned int s3c2410wdt_get_bootstatus(struct s3c2410_wdt *wdt)static inline const struct s3c2410_wdt_variant *s3c2410_get_wdt_drv_data (struct platform_device *pdev) { -if (pdev->dev.of_node) { -const struct of_device_id *match; - match =of_match_node (s3c2410_wdt_match, pdev->dev.of_node); -return (const struct s3c2410_wdt_variant *)match->data; - }else { -return (const struct s3c2410_wdt_variant *) -platform_get_device_id (pdev)->driver_data; +const struct s3c2410_wdt_variant *variant; + + variant =of_device_get_match_data (&pdev->dev); +if (!variant) { +/* Device matched by platform_device_id */ + variant = (const struct s3c2410_wdt_variant *) +platform_get_device_id (pdev)->driver_data; } + +return variant; }static int s3c2410wdt_probe (struct platform_device *pdev)
Signature · 1 line
2.9.3
Krzysztof Kozlowski
maintainerPATCH 7/7 watchdog: s3c2410: Minor code cleanup
In reply to Krzysztof KozlowskiCleanup the code from minor readability issues (no functional changes):
1. Fix checkpatch: ERROR: Do not include the paragraph about writing to the Free Software Foundation's mailing address.
2. Fix checkpatch: WARNING: quoted string split across lines
3. Fix chechpatch: WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
4. Use 'dev' consistently in probe function instead of mixing dev with &pdev->dev.
--- drivers/watchdog/s3c2410_wdt.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-)
drivers/watchdog/s3c2410_wdt.c +13 -22
@@ -1,5 +1,4 @@ -/* linux/drivers/char/watchdog/s3c2410_wdt.c -* +/* * Copyright (c) 2004 Simtec Electronics * Ben Dooks <[email protected]> *
@@ -17,11 +16,7 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ +*/ #include <linux/module.h> #include <linux/moduleparam.h>
@@ -95,8 +90,7 @@ MODULE_PARM_DESC(tmr_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, " -"0 to reboot (default 0)" ); +MODULE_PARM_DESC (soft_noboot,"Watchdog action, set to 1 to ignore reboots, 0 to reboot (default 0)" );/** * struct s3c2410_wdt_variant - Per-variant config data
@@ -311,7 +305,8 @@ static inline int s3c2410wdt_is_running(struct s3c2410_wdt *wdt)return readl (wdt->reg_base +S3C2410_WTCON ) &S3C2410_WTCON_ENABLE ; } -static int s3c2410wdt_set_heartbeat (struct watchdog_device *wdd,unsigned timeout) +static int s3c2410wdt_set_heartbeat (struct watchdog_device *wdd, +unsigned int timeout) {struct s3c2410_wdt *wdt =watchdog_get_drvdata (wdd);unsigned long freq =clk_get_rate (wdt->clock);
@@ -525,7 +520,7 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev)static int s3c2410wdt_probe (struct platform_device *pdev) { -struct device *dev; +struct device *dev = &pdev->dev;struct s3c2410_wdt *wdt;struct resource *wdt_mem;struct resource *wdt_irq;
@@ -533,13 +528,11 @@ static int s3c2410wdt_probe(struct platform_device *pdev)int started =0 ;int ret; - dev = &pdev->dev; - wdt =devm_kzalloc (dev,sizeof (*wdt),GFP_KERNEL );if (!wdt)return -ENOMEM ; - wdt->dev = &pdev->dev; + wdt->dev = dev;spin_lock_init (&wdt->lock); wdt->wdt_device = s3c2410_wdd;
@@ -595,7 +588,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)/* see if we can actually set the requested timer margin, and if * not, try the default value */ -watchdog_init_timeout (&wdt->wdt_device, tmr_margin, &pdev->dev); +watchdog_init_timeout (&wdt->wdt_device, tmr_margin, dev); ret =s3c2410wdt_set_heartbeat (&wdt->wdt_device, wdt->wdt_device.timeout);if (ret) {
@@ -604,11 +597,10 @@ static int s3c2410wdt_probe(struct platform_device *pdev)if (started ==0 )dev_info (dev, -"tmr_margin value out of range, default %d used\n" , -S3C2410_WATCHDOG_DEFAULT_TIME ); +"tmr_margin value out of range, default %d used\n" , +S3C2410_WATCHDOG_DEFAULT_TIME );else -dev_info (dev,"default timer value is out of range, " -"cannot start\n" ); +dev_info (dev,"default timer value is out of range, cannot start\n" ); } ret = devm_request_irq(dev, wdt_irq->start, s3c2410wdt_irq, 0,
@@ -622,7 +614,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)watchdog_set_restart_priority (&wdt->wdt_device,128 ); wdt->wdt_device.bootstatus =s3c2410wdt_get_bootstatus (wdt); - wdt->wdt_device.parent = &pdev->dev; + wdt->wdt_device.parent = dev; ret =watchdog_register_device (&wdt->wdt_device);if (ret) {
@@ -757,7 +749,6 @@ static struct platform_driver s3c2410wdt_driver = {module_platform_driver (s3c2410wdt_driver); -MODULE_AUTHOR ("Ben Dooks <[email protected]>, " -"Dimitry Andric <[email protected]>" ); +MODULE_AUTHOR ("Ben Dooks <[email protected]>, Dimitry Andric <[email protected]>" );MODULE_DESCRIPTION ("S3C2410 Watchdog Device Driver" );MODULE_LICENSE ("GPL" );
Signature · 1 line
2.9.3
Quoted 7 lines · Krzysztof Kozlowski
Replace the 'debug' module parameter and
pr_info()with proper device dynamic debug calls because this is the preferred and flexible way of enabling debugging printks.Also remove some obvious debug printks.
Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 106 lines
--- drivers/watchdog/s3c2410_wdt.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-)drivers/watchdog/s3c2410_wdt.c +6
-23@@ -23,8 +23,6 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h> @@ -83,13 +81,11 @@ static bool nowayout = WATCHDOG_NOWAYOUT;static int tmr_margin;static int tmr_atboot =S3C2410_WATCHDOG_ATBOOT ;static int soft_noboot; -static int debug;module_param (tmr_margin, int,0 );module_param (tmr_atboot, int,0 );module_param (nowayout, bool,0 );module_param (soft_noboot, int,0 ); -module_param (debug, int,0 ); MODULE_PARM_DESC(tmr_margin, "Watchdog tmr_margin in seconds. (default=" __MODULE_STRING(S3C2410_WATCHDOG_DEFAULT_TIME) ")");@@ -100,7 +96,6 @@ 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, " "0 to reboot (default 0)" ); -MODULE_PARM_DESC (debug,"Watchdog debug, set to >1 for debug (default 0)" );/** * struct s3c2410_wdt_variant - Per-variant config data @@ -204,14 +199,6 @@ static const struct platform_device_id s3c2410_wdt_ids[] = { };MODULE_DEVICE_TABLE (platform, s3c2410_wdt_ids); -/* watchdog control routines */ - -#define DBG (fmt, ...) \ -do { \ - if (debug) \ - pr_info(fmt, ##__VA_ARGS__); \ -} while (0) -/* functions */ static inline unsigned int s3c2410wdt_max_timeout (struct clk *clock)@@ -307,8 +294,8 @@ static int s3c2410wdt_start(struct watchdog_device *wdd) wtcon |=S3C2410_WTCON_RSTEN ; } -DBG ("%s: count=0x%08x, wtcon=%08lx\n" , - __func__, wdt->count, wtcon); +dev_dbg (wdt->dev,"Starting watchdog: count=0x%08x, wtcon=%08lx\n" , + wdt->count, wtcon);writel (wdt->count, wdt->reg_base +S3C2410_WTDAT );writel (wdt->count, wdt->reg_base +S3C2410_WTCNT );@@ -337,8 +324,8 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou freq =DIV_ROUND_UP (freq,128 ); count = timeout * freq; -DBG ("%s: count=%d, timeout=%d, freq=%lu\n" , - __func__, count, timeout, freq); +dev_dbg (wdt->dev,"Heartbeat: count=%d, timeout=%d, freq=%lu\n" , + count, timeout, freq);/* if the count is bigger than the watchdog register, then work out what we need to do (and if) we can @@ -354,8 +341,8 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou } } -DBG ("%s: timeout=%d, divisor=%d, count=%d (%08x)\n" , - __func__, timeout, divisor, count,DIV_ROUND_UP (count, divisor)); +dev_dbg (wdt->dev,"Heartbeat: timeout=%d, divisor=%d, count=%d (%08x)\n" , + timeout, divisor, count,DIV_ROUND_UP (count, divisor)); count =DIV_ROUND_UP (count, divisor); wdt->count = count;@@ -544,8 +531,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev)int started =0 ;int ret; -DBG ("%s: probe=%p\n" , __func__, pdev); - dev = &pdev->dev; wdt =devm_kzalloc (dev,sizeof (*wdt),GFP_KERNEL );@@ -581,8 +566,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev) goto err; } -DBG ("probe: mapped reg_base=%p\n" , wdt->reg_base); - wdt->clock =devm_clk_get (dev,"watchdog" );if (IS_ERR (wdt->clock)) {dev_err (dev,"failed to find watchdog clock source\n" );