[PATCH 1/5 v3] WATCHDOG: mtx1-wdt: use dev_{err,info} instead of printk()

[PATCH 1/5 v3] WATCHDOG: mtx1-wdt: use dev_{err,info} instead of printk()

[Florian Fainelli]

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
No changes in v1, v2 and v3

diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 1479dc4..63df28c 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -224,11 +224,11 @@ static int __devinit mtx1_wdt_probe(struct platform_device *pdev)
 
 	ret = misc_register(&mtx1_wdt_misc);
 	if (ret < 0) {
-		printk(KERN_ERR " mtx-1_wdt : failed to register\n");
+		dev_err(&pdev->dev, "failed to register\n");
 		return ret;
 	}
 	mtx1_wdt_start();
-	printk(KERN_INFO "MTX-1 Watchdog driver\n");
+	dev_info(&pdev->dev, "MTX-1 Watchdog driver\n");
 	return 0;
 }
 
-- 
1.7.4.1

Re: [PATCH 1/5 v3] WATCHDOG: mtx1-wdt: use dev_{err,info} instead of printk()

[Florian Fainelli]

On Wednesday 15 June 2011 19:15:09 Florian Fainelli wrote:
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> No changes in v1, v2 and v3

Wim, these are mostly fixes for the driver, do you prefer they get merged with the MIPS tree?

> 
> diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
> index 1479dc4..63df28c 100644
> --- a/drivers/watchdog/mtx-1_wdt.c
> +++ b/drivers/watchdog/mtx-1_wdt.c
> @@ -224,11 +224,11 @@ static int __devinit mtx1_wdt_probe(struct
> platform_device *pdev)
> 
>  	ret = misc_register(&mtx1_wdt_misc);
>  	if (ret < 0) {
> -		printk(KERN_ERR " mtx-1_wdt : failed to register\n");
> +		dev_err(&pdev->dev, "failed to register\n");
>  		return ret;
>  	}
>  	mtx1_wdt_start();
> -	printk(KERN_INFO "MTX-1 Watchdog driver\n");
> +	dev_info(&pdev->dev, "MTX-1 Watchdog driver\n");
>  	return 0;
>  }

Re: [PATCH 1/5 v3] WATCHDOG: mtx1-wdt: use dev_{err,info} instead of printk()

[Wim Van Sebroeck]

Hi Florian,

> On Wednesday 15 June 2011 19:15:09 Florian Fainelli wrote:
> > Signed-off-by: Florian Fainelli <florian@openwrt.org>
> > ---
> > No changes in v1, v2 and v3
> 
> Wim, these are mostly fixes for the driver, do you prefer they get merged with the MIPS tree?

No, I had them in linux-2.6-watchdog-next since this weekend allready and was planning to sent the fixes upstream.
But I think I fotgot to e-mail about it. :-(

Kind regards,
Wim.

Re: [PATCH 1/5 v3] WATCHDOG: mtx1-wdt: use dev_{err,info} instead of printk()

[Florian Fainelli]

Hello Wim,

On Wednesday 22 June 2011 10:58:09 Wim Van Sebroeck wrote:
> Hi Florian,
> 
> > On Wednesday 15 June 2011 19:15:09 Florian Fainelli wrote:
> > > Signed-off-by: Florian Fainelli <florian@openwrt.org>
> > > ---
> > > No changes in v1, v2 and v3
> > 
> > Wim, these are mostly fixes for the driver, do you prefer they get merged
> > with the MIPS tree?
> 
> No, I had them in linux-2.6-watchdog-next since this weekend allready and
> was planning to sent the fixes upstream. But I think I fotgot to e-mail
> about it. :-(

No problem, thanks for the heads up.
--
Florian