2014-02-04 08:49:41

by Axel Lin

Subject: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static

Signed-off-by: Axel Lin <[email protected]>
---
drivers/pinctrl/pinctrl-capri.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-capri.c b/drivers/pinctrl/pinctrl-capri.c
index 4669c53..b4aa8e3 100644
--- a/drivers/pinctrl/pinctrl-capri.c
+++ b/drivers/pinctrl/pinctrl-capri.c
@@ -1390,7 +1390,7 @@ static struct pinctrl_desc capri_pinctrl_desc = {
.owner = THIS_MODULE,
};

-int __init capri_pinctrl_probe(struct platform_device *pdev)
+static int __init capri_pinctrl_probe(struct platform_device *pdev)
{
struct capri_pinctrl_data *pdata = &capri_pinctrl;
struct resource *res;
--
1.8.1.2

2014-02-04 20:14:32

by Sherman Yin

Subject: Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static

On 14-02-04 12:49 AM, Axel Lin wrote:
> Signed-off-by: Axel Lin <[email protected]>
> ---
> drivers/pinctrl/pinctrl-capri.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-capri.c b/drivers/pinctrl/pinctrl-capri.c
> index 4669c53..b4aa8e3 100644
> --- a/drivers/pinctrl/pinctrl-capri.c
> +++ b/drivers/pinctrl/pinctrl-capri.c
> @@ -1390,7 +1390,7 @@ static struct pinctrl_desc capri_pinctrl_desc = {
> .owner = THIS_MODULE,
> };
>
> -int __init capri_pinctrl_probe(struct platform_device *pdev)
> +static int __init capri_pinctrl_probe(struct platform_device *pdev)
> {
> struct capri_pinctrl_data *pdata = &capri_pinctrl;
> struct resource *res;
>
Note that this will collide with the capri->bcm281xx renaming patches.

Linus, Christian, are those patches going in soon?

Thanks,
Sherman

2014-02-06 09:21:47

by Linus Walleij

Subject: Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static

On Tue, Feb 4, 2014 at 9:13 PM, Sherman Yin <[email protected]> wrote:
> On 14-02-04 12:49 AM, Axel Lin wrote:
>>
>> Signed-off-by: Axel Lin <[email protected]>
>>
> Note that this will collide with the capri->bcm281xx renaming patches.
>
> Linus, Christian, are those patches going in soon?

I have ACKed it, expecting it to be funneled through ARM SoC.

Yours,
Linus Walleij

2014-02-07 18:35:22

by Christian Daudt

Subject: Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static

On Thu, Feb 6, 2014 at 1:21 AM, Linus Walleij <[email protected]> wrote:
> On Tue, Feb 4, 2014 at 9:13 PM, Sherman Yin <[email protected]> wrote:
>> On 14-02-04 12:49 AM, Axel Lin wrote:
>>>
>>> Signed-off-by: Axel Lin <[email protected]>
>>>
>> Note that this will collide with the capri->bcm281xx renaming patches.
>>
>> Linus, Christian, are those patches going in soon?
>
> I have ACKed it, expecting it to be funneled through ARM SoC.
>
> Yours,
> Linus Walleij

Linus, just to confirm. the bcm_defconfig portion is the only one
going through armsoc right ?

thanks,
csd

2014-02-07 19:01:56

by Christian Daudt

Subject: Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static

On Fri, Feb 7, 2014 at 10:35 AM, Christian Daudt <[email protected]> wrote:
> On Thu, Feb 6, 2014 at 1:21 AM, Linus Walleij <[email protected]> wrote:
>> On Tue, Feb 4, 2014 at 9:13 PM, Sherman Yin <[email protected]> wrote:
>>> On 14-02-04 12:49 AM, Axel Lin wrote:
>>>>
>>>> Signed-off-by: Axel Lin <[email protected]>
>>>>
>>> Note that this will collide with the capri->bcm281xx renaming patches.
>>>
>>> Linus, Christian, are those patches going in soon?
>>
>> I have ACKed it, expecting it to be funneled through ARM SoC.
>>
>> Yours,
>> Linus Walleij
>
> Linus, just to confirm. the bcm_defconfig portion is the only one
> going through armsoc right ?
>
> thanks,
> csd

Linus,
Sorry for the noise. I just had a chat with Olof on irc and it is
probably best to revert to v1 and push a single patch through, either
through pinctrl or armsoc. If you have further patches for 3.14 could
you pull this one in along with it ? If not then I'll ask Olof to pull
it in instead.
thanks,
csd

2014-02-10 08:14:33

by Linus Walleij

Subject: Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static

On Fri, Feb 7, 2014 at 8:01 PM, Christian Daudt <[email protected]> wrote:
> On Fri, Feb 7, 2014 at 10:35 AM, Christian Daudt <[email protected]> wrote:
>> On Thu, Feb 6, 2014 at 1:21 AM, Linus Walleij <[email protected]> wrote:
>>> On Tue, Feb 4, 2014 at 9:13 PM, Sherman Yin <[email protected]> wrote:
>>>> On 14-02-04 12:49 AM, Axel Lin wrote:
>>>>>
>>>>> Signed-off-by: Axel Lin <[email protected]>
>>>>>
>>>> Note that this will collide with the capri->bcm281xx renaming patches.
>>>>
>>>> Linus, Christian, are those patches going in soon?
>>>
>>> I have ACKed it, expecting it to be funneled through ARM SoC.
>>>
>>> Yours,
>>> Linus Walleij
>>
>> Linus, just to confirm. the bcm_defconfig portion is the only one
>> going through armsoc right ?
>>
>> thanks,
>> csd
>
> Linus,
> Sorry for the noise. I just had a chat with Olof on irc and it is
> probably best to revert to v1 and push a single patch through, either
> through pinctrl or armsoc. If you have further patches for 3.14 could
> you pull this one in along with it ? If not then I'll ask Olof to pull
> it in instead.

Not quite following, I have ACKed the patches, so please push
whatever changes you need done through ARM SoC as this is
basically a device tree problem.

Yours,
Linus Walleij