diff mbox

[3/3] pinctrl: mvebu: silence WARN to dev_warn

Message ID 1393977790-29110-4-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sebastian Hesselbarth March 5, 2014, 12:03 a.m. UTC
Pinctrl will WARN on missing DT resources, which is a little bit too
noisy. Use dev_warn with FW_BUG instead.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <linux@arm.linux.org.uk> 
Cc: Jason Cooper <jason@lakedaemon.net> 
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: devicetree@vger.kernel.org 
Cc: linux-arm-kernel@lists.infradead.org 
Cc: linux-kernel@vger.kernel.org
---
 drivers/pinctrl/mvebu/pinctrl-dove.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jason Cooper March 6, 2014, 8:18 p.m. UTC | #1
On Wed, Mar 05, 2014 at 01:03:10AM +0100, Sebastian Hesselbarth wrote:
> Pinctrl will WARN on missing DT resources, which is a little bit too
> noisy. Use dev_warn with FW_BUG instead.
> 
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Cc: Russell King <linux@arm.linux.org.uk> 
> Cc: Jason Cooper <jason@lakedaemon.net> 
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: devicetree@vger.kernel.org 
> Cc: linux-arm-kernel@lists.infradead.org 
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/pinctrl/mvebu/pinctrl-dove.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied to mvebu/pinctrl

thx,

Jason.
Linus Walleij March 7, 2014, 3:48 a.m. UTC | #2
On Fri, Mar 7, 2014 at 4:18 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Wed, Mar 05, 2014 at 01:03:10AM +0100, Sebastian Hesselbarth wrote:
>> Pinctrl will WARN on missing DT resources, which is a little bit too
>> noisy. Use dev_warn with FW_BUG instead.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> ---
>> Cc: Russell King <linux@arm.linux.org.uk>
>> Cc: Jason Cooper <jason@lakedaemon.net>
>> Cc: Andrew Lunn <andrew@lunn.ch>
>> Cc: Gregory Clement <gregory.clement@free-electrons.com>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Cc: devicetree@vger.kernel.org
>> Cc: linux-arm-kernel@lists.infradead.org
>> Cc: linux-kernel@vger.kernel.org
>> ---
>>  drivers/pinctrl/mvebu/pinctrl-dove.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> Applied to mvebu/pinctrl

So are you carrying this patch, or shall I apply it to my tree?

In the former case: Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
Jason Cooper March 7, 2014, 3:50 a.m. UTC | #3
On Fri, Mar 07, 2014 at 11:48:25AM +0800, Linus Walleij wrote:
> On Fri, Mar 7, 2014 at 4:18 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> > On Wed, Mar 05, 2014 at 01:03:10AM +0100, Sebastian Hesselbarth wrote:
> >> Pinctrl will WARN on missing DT resources, which is a little bit too
> >> noisy. Use dev_warn with FW_BUG instead.
> >>
> >> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> >> ---
> >> Cc: Russell King <linux@arm.linux.org.uk>
> >> Cc: Jason Cooper <jason@lakedaemon.net>
> >> Cc: Andrew Lunn <andrew@lunn.ch>
> >> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> >> Cc: Linus Walleij <linus.walleij@linaro.org>
> >> Cc: devicetree@vger.kernel.org
> >> Cc: linux-arm-kernel@lists.infradead.org
> >> Cc: linux-kernel@vger.kernel.org
> >> ---
> >>  drivers/pinctrl/mvebu/pinctrl-dove.c | 3 ++-
> >>  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > Applied to mvebu/pinctrl
> 
> So are you carrying this patch, or shall I apply it to my tree?
> 
> In the former case: Acked-by: Linus Walleij <linus.walleij@linaro.org>

I'll send you a pull tomorrow.

thx,

Jason.
Linus Walleij March 7, 2014, 3:56 a.m. UTC | #4
On Fri, Mar 7, 2014 at 11:50 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Fri, Mar 07, 2014 at 11:48:25AM +0800, Linus Walleij wrote:
>> On Fri, Mar 7, 2014 at 4:18 AM, Jason Cooper <jason@lakedaemon.net> wrote:
>> > On Wed, Mar 05, 2014 at 01:03:10AM +0100, Sebastian Hesselbarth wrote:
>> >> Pinctrl will WARN on missing DT resources, which is a little bit too
>> >> noisy. Use dev_warn with FW_BUG instead.
>> >>
>> >> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> >> ---
>> >> Cc: Russell King <linux@arm.linux.org.uk>
>> >> Cc: Jason Cooper <jason@lakedaemon.net>
>> >> Cc: Andrew Lunn <andrew@lunn.ch>
>> >> Cc: Gregory Clement <gregory.clement@free-electrons.com>
>> >> Cc: Linus Walleij <linus.walleij@linaro.org>
>> >> Cc: devicetree@vger.kernel.org
>> >> Cc: linux-arm-kernel@lists.infradead.org
>> >> Cc: linux-kernel@vger.kernel.org
>> >> ---
>> >>  drivers/pinctrl/mvebu/pinctrl-dove.c | 3 ++-
>> >>  1 file changed, 2 insertions(+), 1 deletion(-)
>> >
>> > Applied to mvebu/pinctrl
>>
>> So are you carrying this patch, or shall I apply it to my tree?
>>
>> In the former case: Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> I'll send you a pull tomorrow.

For a single patch?

Remember I want the DTS changes to go to ARM SoC on some different
pull...

Yours,
Linus Walleij
Jason Cooper March 7, 2014, 1:46 p.m. UTC | #5
On Fri, Mar 07, 2014 at 11:56:11AM +0800, Linus Walleij wrote:
> On Fri, Mar 7, 2014 at 11:50 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> > On Fri, Mar 07, 2014 at 11:48:25AM +0800, Linus Walleij wrote:
> >> On Fri, Mar 7, 2014 at 4:18 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> >> > On Wed, Mar 05, 2014 at 01:03:10AM +0100, Sebastian Hesselbarth wrote:
> >> >> Pinctrl will WARN on missing DT resources, which is a little bit too
> >> >> noisy. Use dev_warn with FW_BUG instead.
> >> >>
> >> >> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> >> >> ---
> >> >> Cc: Russell King <linux@arm.linux.org.uk>
> >> >> Cc: Jason Cooper <jason@lakedaemon.net>
> >> >> Cc: Andrew Lunn <andrew@lunn.ch>
> >> >> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> >> >> Cc: Linus Walleij <linus.walleij@linaro.org>
> >> >> Cc: devicetree@vger.kernel.org
> >> >> Cc: linux-arm-kernel@lists.infradead.org
> >> >> Cc: linux-kernel@vger.kernel.org
> >> >> ---
> >> >>  drivers/pinctrl/mvebu/pinctrl-dove.c | 3 ++-
> >> >>  1 file changed, 2 insertions(+), 1 deletion(-)
> >> >
> >> > Applied to mvebu/pinctrl
> >>
> >> So are you carrying this patch, or shall I apply it to my tree?
> >>
> >> In the former case: Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >
> > I'll send you a pull tomorrow.
> 
> For a single patch?

Well, just the doc change and WARN change.  I've already taken the dts
change into mvebu/dt (for arm-soc).

There should be no need for these two to be in mvebu's for-next, so if
it's easier for you to pick them, please do so.

I'll drop them from mvebu/pinctrl and update mvebu's for-next right now.

thx,

Jason.
Linus Walleij March 12, 2014, 2:02 p.m. UTC | #6
On Fri, Mar 7, 2014 at 2:46 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Fri, Mar 07, 2014 at 11:56:11AM +0800, Linus Walleij wrote:

>> For a single patch?
>
> Well, just the doc change and WARN change.  I've already taken the dts
> change into mvebu/dt (for arm-soc).

I've applied this patch [3/3] to the pinctrl tree.

> There should be no need for these two to be in mvebu's for-next, so if
> it's easier for you to pick them, please do so.
>
> I'll drop them from mvebu/pinctrl and update mvebu's for-next right now.

No, I mean, please apply patch 1/3 and 2/3 to the mvebu tree.
There is no need to sync DTS and pinctrl driver changes. This
patch to the pinctrl driver I want to carry however.

Yours,
Linus Walleij
Jason Cooper March 12, 2014, 3:46 p.m. UTC | #7
On Wed, Mar 12, 2014 at 03:02:02PM +0100, Linus Walleij wrote:
> On Fri, Mar 7, 2014 at 2:46 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> > On Fri, Mar 07, 2014 at 11:56:11AM +0800, Linus Walleij wrote:
> 
> >> For a single patch?
> >
> > Well, just the doc change and WARN change.  I've already taken the dts
> > change into mvebu/dt (for arm-soc).
> 
> I've applied this patch [3/3] to the pinctrl tree.

Ok, thanks.

> > There should be no need for these two to be in mvebu's for-next, so if
> > it's easier for you to pick them, please do so.
> >
> > I'll drop them from mvebu/pinctrl and update mvebu's for-next right now.
> 
> No, I mean, please apply patch 1/3 and 2/3 to the mvebu tree.
> There is no need to sync DTS and pinctrl driver changes. This
> patch to the pinctrl driver I want to carry however.

Sorry I wasn't clear.  patch 2/3 depends on

  356ca6ce0aa4 devicetree: bindings: update MVEBU pinctrl binding documentation

Which is in the mvebu/pinctrl branch you have merged into your tree.

I usually keep the binding documentation changes in the same branch with
the code changes so that during a future bisect, the documentation has a
better chance of being consistent with the code at the point of failure.
It's a detail thing, I know, but I couldn't find a downside to doing it.
Well, until now.  :-)

thx,

Jason.
diff mbox

Patch

diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 9e7ff651c018..3b022178a566 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -832,7 +832,8 @@  static int dove_pinctrl_probe(struct platform_device *pdev)
 	}
 
 	/* Warn on any missing DT resource */
-	WARN(fb_res.start, FW_BUG "Missing pinctrl regs in DTB. Please update your firmware.\n");
+	if (fb_res.start)
+		dev_warn(&pdev->dev, FW_BUG "Missing pinctrl regs in DTB. Please update your firmware.\n");
 
 	return mvebu_pinctrl_probe(pdev);
 }