Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

[Paul Gortmaker]

On Fri, May 4, 2012 at 9:39 AM, Lee Jones <lee.jones@linaro.org> wrote:
> On 04/05/12 14:26, Chris Ball wrote:
>>
>> Hi,
>>
>> On Fri, May 04 2012, Lee Jones wrote:
>>>
>>> I can either do that, or push it through Arnd's tree if you like (and
>>> it's okay with him), as I will be supplying him with another pull
>>> request after my next patch-set has been scrutinised. Would that suit
>>> you better?
>>
>>
>> If the MMC patches are self-contained and it doesn't break anything to

Hi All,

The version of these patches that just appeared in linux-next is causing
build fails on about 5 different configs (versatile_defconfig etc).

It isn't hard to see (with hindsight) that the new function is declared in
an #ifdef CONFIG_OF block, but it's callers are not similarly guarded.
So you get things like this:

http://kisskb.ellerman.id.au/kisskb/buildresult/6272348/

If you can get a fixed up version into the linux-next queue ASAP, that
would be great.

Thanks,
Paul.
--


>> merge them separately, my preference is to merge them via the MMC tree
>> (to avoid creating conflicts against other MMC patches in there).
>>
>> If there are dependencies, going via Arnd instead is fine.
>
>
> Okay, I'll knock up a small patch-set and send it to you.
>
> I think it's 3 patches.
>
>
> --
> Lee Jones
> Linaro ST-Ericsson Landing Team Lead
> M: +44 77 88 633 515
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

[Lee Jones]

On 07/05/12 23:00, Paul Gortmaker wrote:
> On Fri, May 4, 2012 at 9:39 AM, Lee Jones<lee.jones@linaro.org>  wrote:
>> On 04/05/12 14:26, Chris Ball wrote:
>>>
>>> Hi,
>>>
>>> On Fri, May 04 2012, Lee Jones wrote:
>>>>
>>>> I can either do that, or push it through Arnd's tree if you like (and
>>>> it's okay with him), as I will be supplying him with another pull
>>>> request after my next patch-set has been scrutinised. Would that suit
>>>> you better?
>>>
>>>
>>> If the MMC patches are self-contained and it doesn't break anything to
>
> Hi All,
>
> The version of these patches that just appeared in linux-next is causing
> build fails on about 5 different configs (versatile_defconfig etc).
>
> It isn't hard to see (with hindsight) that the new function is declared in
> an #ifdef CONFIG_OF block, but it's callers are not similarly guarded.
> So you get things like this:
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/6272348/
>
> If you can get a fixed up version into the linux-next queue ASAP, that
> would be great.

I've fixed the issue. How would you like the fix?

As a fix patch, or a replacement for the broken one?

Kind regards,
Lee

>>> merge them separately, my preference is to merge them via the MMC tree
>>> (to avoid creating conflicts against other MMC patches in there).
>>>
>>> If there are dependencies, going via Arnd instead is fine.
>>
>>
>> Okay, I'll knock up a small patch-set and send it to you.
>>
>> I think it's 3 patches.

Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

[Chris Ball]

Hi Lee,

On Tue, May 08 2012, Lee Jones wrote:
> I've fixed the issue. How would you like the fix?
>
> As a fix patch, or a replacement for the broken one?

Let's go with a fix patch.  (I may squash it into the original later,
before sending it to Linus.)

Thanks,

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

[Lee Jones]

Here you go Chris.

From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 8 May 2012 13:40:02 +0100
Subject: [PATCH] MMC: mmci: Fix compiler error when CONFIG_OF is not set

error: implicit declaration of function 'mmci_dt_populate_generic_pdata'

This is due to the '#if CONFIG_OF' guards placed around
mmci_dt_populate_generic_pdata(), but not around the call to it. We
repair this by inserting a stub which elegantly returns when CONFIG_OF
is not set.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mmc/host/mmci.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 2303a16..efc822d 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1241,6 +1241,12 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
 		pr_warn("%s: Unsupported bus width\n", np->full_name);
 	}
 }
+#else
+static void mmci_dt_populate_generic_pdata(struct device_node *np,
+					struct mmci_platform_data *pdata)
+{
+	return;
+}
 #endif
 
 static int __devinit mmci_probe(struct amba_device *dev,
-- 
1.7.9.5

Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

[Chris Ball]

Hi,

On Tue, May 08 2012, Lee Jones wrote:
> Here you go Chris.
>
> From: Lee Jones <lee.jones@linaro.org>
> Date: Tue, 8 May 2012 13:40:02 +0100
> Subject: [PATCH] MMC: mmci: Fix compiler error when CONFIG_OF is not set
>
> error: implicit declaration of function 'mmci_dt_populate_generic_pdata'
>
> This is due to the '#if CONFIG_OF' guards placed around
> mmci_dt_populate_generic_pdata(), but not around the call to it. We
> repair this by inserting a stub which elegantly returns when CONFIG_OF
> is not set.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/mmc/host/mmci.c |    6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
> index 2303a16..efc822d 100644
> --- a/drivers/mmc/host/mmci.c
> +++ b/drivers/mmc/host/mmci.c
> @@ -1241,6 +1241,12 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
>  		pr_warn("%s: Unsupported bus width\n", np->full_name);
>  	}
>  }
> +#else
> +static void mmci_dt_populate_generic_pdata(struct device_node *np,
> +					struct mmci_platform_data *pdata)
> +{
> +	return;
> +}
>  #endif
>  
>  static int __devinit mmci_probe(struct amba_device *dev,

Thanks, this is in mmc-next now.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

[Paul Gortmaker]

On Tue, May 8, 2012 at 8:59 AM, Lee Jones <lee.jones@linaro.org> wrote:
> Here you go Chris.
>
> From: Lee Jones <lee.jones@linaro.org>
> Date: Tue, 8 May 2012 13:40:02 +0100
> Subject: [PATCH] MMC: mmci: Fix compiler error when CONFIG_OF is not set
>
> error: implicit declaration of function 'mmci_dt_populate_generic_pdata'
>
> This is due to the '#if CONFIG_OF' guards placed around
> mmci_dt_populate_generic_pdata(), but not around the call to it. We
> repair this by inserting a stub which elegantly returns when CONFIG_OF
> is not set.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Please if possible, do not neglect to add the Reported-by: line when
appropriate.  I've been at this long enough that it really won't change
my life any if it is there or not there, but for someone new to linux, it
might make the difference between an "I'm glad I reported that" vs.
a "Screw them, I'm not reporting anything else in the future."

Thanks,
Paul.
--

> ---
>  drivers/mmc/host/mmci.c |    6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
> index 2303a16..efc822d 100644
> --- a/drivers/mmc/host/mmci.c
> +++ b/drivers/mmc/host/mmci.c
> @@ -1241,6 +1241,12 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
>                pr_warn("%s: Unsupported bus width\n", np->full_name);
>        }
>  }
> +#else
> +static void mmci_dt_populate_generic_pdata(struct device_node *np,
> +                                       struct mmci_platform_data *pdata)
> +{
> +       return;
> +}
>  #endif
>
>  static int __devinit mmci_probe(struct amba_device *dev,
> --
> 1.7.9.5
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

[Chris Ball]

Hi Paul,

On Tue, May 08 2012, Paul Gortmaker wrote:
> On Tue, May 8, 2012 at 8:59 AM, Lee Jones <lee.jones@linaro.org> wrote:
>> Here you go Chris.
>>
>> From: Lee Jones <lee.jones@linaro.org>
>> Date: Tue, 8 May 2012 13:40:02 +0100
>> Subject: [PATCH] MMC: mmci: Fix compiler error when CONFIG_OF is not set
>>
>> error: implicit declaration of function 'mmci_dt_populate_generic_pdata'
>>
>> This is due to the '#if CONFIG_OF' guards placed around
>> mmci_dt_populate_generic_pdata(), but not around the call to it. We
>> repair this by inserting a stub which elegantly returns when CONFIG_OF
>> is not set.
>>
>> Signed-off-by: Lee Jones <lee.jones@linaro.org>
>
> Please if possible, do not neglect to add the Reported-by: line when
> appropriate.  I've been at this long enough that it really won't change
> my life any if it is there or not there, but for someone new to linux, it
> might make the difference between an "I'm glad I reported that" vs.
> a "Screw them, I'm not reporting anything else in the future."

Agreed -- I added a Reported-by line when I applied the patch:

http://git.kernel.org/?p=linux/kernel/git/cjb/mmc.git;a=commit;h=c0a120a4bc68f5dc5f5238e76013cc18bac0ffed

Thanks,

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500

[Paul Gortmaker]

[Re: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500] On 08/05/2012 (Tue 20:29) Chris Ball wrote:

> Hi Paul,
> 
> On Tue, May 08 2012, Paul Gortmaker wrote:
> > On Tue, May 8, 2012 at 8:59 AM, Lee Jones <lee.jones@linaro.org> wrote:
> >> Here you go Chris.
> >>
> >> From: Lee Jones <lee.jones@linaro.org>
> >> Date: Tue, 8 May 2012 13:40:02 +0100
> >> Subject: [PATCH] MMC: mmci: Fix compiler error when CONFIG_OF is not set
> >>
> >> error: implicit declaration of function 'mmci_dt_populate_generic_pdata'
> >>
> >> This is due to the '#if CONFIG_OF' guards placed around
> >> mmci_dt_populate_generic_pdata(), but not around the call to it. We
> >> repair this by inserting a stub which elegantly returns when CONFIG_OF
> >> is not set.
> >>
> >> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> >
> > Please if possible, do not neglect to add the Reported-by: line when
> > appropriate.  I've been at this long enough that it really won't change
> > my life any if it is there or not there, but for someone new to linux, it
> > might make the difference between an "I'm glad I reported that" vs.
> > a "Screw them, I'm not reporting anything else in the future."
> 
> Agreed -- I added a Reported-by line when I applied the patch:
> 
> http://git.kernel.org/?p=linux/kernel/git/cjb/mmc.git;a=commit;h=c0a120a4bc68f5dc5f5238e76013cc18bac0ffed

Cool, thanks Chris -- you may not hear it, but I'm sure you've
implicitly helped keep people involved in the triage process.

Paul.
--

> 
> Thanks,
> 
> - Chris.
> -- 
> Chris Ball   <cjb@laptop.org>   <http://printf.net/>
> One Laptop Per Child