Re: [ulf.hansson-mmc:next 62/67] drivers/mmc/host/sdhci.c:1199:4: error: 'mmc' undeclared

Re: [ulf.hansson-mmc:next 62/67] drivers/mmc/host/sdhci.c:1199:4: error: 'mmc' undeclared

[Ulf Hansson]

On 1 September 2014 04:40, Dong Aisheng <b29396@freescale.com> wrote:
> Hi Ulf,
>
> On Fri, Aug 29, 2014 at 09:27:10PM +0800, kbuild test robot wrote:
>> tree:   git://git.linaro.org/people/ulf.hansson/mmc next
>> head:   1a3c4f637e87dbdda6000b5d5cd9b590d3ec6f46
>> commit: cdfd9a2374ab63189ddeb5bf456bd3418ec559ec [62/67] mmc: sdhci: add platfrom get_max_timeout_count hook
>> config: make ARCH=x86_64 allmodconfig
>>
>> Note: the ulf.hansson-mmc/next HEAD 1a3c4f637e87dbdda6000b5d5cd9b590d3ec6f46 builds fine.
>>       It only hurts bisectibility.
>>
>> All error/warnings:
>>
>>    drivers/mmc/host/sdhci.c: In function 'sdhci_set_clock':
>> >> drivers/mmc/host/sdhci.c:1199:4: error: 'mmc' undeclared (first use in this function)
>>        mmc->max_busy_timeout =
>>        ^
>>    drivers/mmc/host/sdhci.c:1199:4: note: each undeclared identifier is reported only once for each function it appears in
>>
>> vim +/mmc +1199 drivers/mmc/host/sdhci.c
>>
>>   1193
>>   1194        clock_set:
>>   1195                if (real_div) {
>>   1196                        host->mmc->actual_clock = (host->max_clk * clk_mul) / real_div;
>>   1197                        if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK) {
>>   1198                                host->timeout_clk = host->mmc->actual_clock / 1000;
>> > 1199                                mmc->max_busy_timeout =
>>   1200                                                host->ops->get_max_timeout_count ?
>>   1201                                                host->ops->get_max_timeout_count(host) :
>>   1202                                                1 << 27;
>>
>
> Sorry for this bisect issue.
> Can you squash the following changes into the original commit to fix it?
>
> commit 94c10a5d2e78f7dddb67e0881799448ed5d650d3
> Author: Dong Aisheng <b29396@freescale.com>
> Date:   Mon Sep 1 10:33:16 2014 +0800
>
>     mmc: sdhci: fix bisect issue
>
>     Signed-off-by: Dong Aisheng <b29396@freescale.com>

Hi Dong,

Thanks for fix, I have squashed it into the original commit.

Additionally, while rebasing the branch the last patch in this series
hit a merge conflict, but managed to fix that myself. Still you may
want to have a look at the end result to verify I didn't screw up.

Kind regards
Uffe

Re: [ulf.hansson-mmc:next 62/67] drivers/mmc/host/sdhci.c:1199:4: error: 'mmc' undeclared

[Dong Aisheng]

On Mon, Sep 01, 2014 at 09:32:29AM +0200, Ulf Hansson wrote:
> On 1 September 2014 04:40, Dong Aisheng <b29396@freescale.com> wrote:
> > Hi Ulf,
> >
> > On Fri, Aug 29, 2014 at 09:27:10PM +0800, kbuild test robot wrote:
> >> tree:   git://git.linaro.org/people/ulf.hansson/mmc next
> >> head:   1a3c4f637e87dbdda6000b5d5cd9b590d3ec6f46
> >> commit: cdfd9a2374ab63189ddeb5bf456bd3418ec559ec [62/67] mmc: sdhci: add platfrom get_max_timeout_count hook
> >> config: make ARCH=x86_64 allmodconfig
> >>
> >> Note: the ulf.hansson-mmc/next HEAD 1a3c4f637e87dbdda6000b5d5cd9b590d3ec6f46 builds fine.
> >>       It only hurts bisectibility.
> >>
> >> All error/warnings:
> >>
> >>    drivers/mmc/host/sdhci.c: In function 'sdhci_set_clock':
> >> >> drivers/mmc/host/sdhci.c:1199:4: error: 'mmc' undeclared (first use in this function)
> >>        mmc->max_busy_timeout =
> >>        ^
> >>    drivers/mmc/host/sdhci.c:1199:4: note: each undeclared identifier is reported only once for each function it appears in
> >>
> >> vim +/mmc +1199 drivers/mmc/host/sdhci.c
> >>
> >>   1193
> >>   1194        clock_set:
> >>   1195                if (real_div) {
> >>   1196                        host->mmc->actual_clock = (host->max_clk * clk_mul) / real_div;
> >>   1197                        if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK) {
> >>   1198                                host->timeout_clk = host->mmc->actual_clock / 1000;
> >> > 1199                                mmc->max_busy_timeout =
> >>   1200                                                host->ops->get_max_timeout_count ?
> >>   1201                                                host->ops->get_max_timeout_count(host) :
> >>   1202                                                1 << 27;
> >>
> >
> > Sorry for this bisect issue.
> > Can you squash the following changes into the original commit to fix it?
> >
> > commit 94c10a5d2e78f7dddb67e0881799448ed5d650d3
> > Author: Dong Aisheng <b29396@freescale.com>
> > Date:   Mon Sep 1 10:33:16 2014 +0800
> >
> >     mmc: sdhci: fix bisect issue
> >
> >     Signed-off-by: Dong Aisheng <b29396@freescale.com>
> 
> Hi Dong,
> 
> Thanks for fix, I have squashed it into the original commit.
> 
> Additionally, while rebasing the branch the last patch in this series
> hit a merge conflict, but managed to fix that myself. Still you may
> want to have a look at the end result to verify I didn't screw up.
> 

I checked it's ok.
Thanks a lot.

Regards
Dong Aisheng

> Kind regards
> Uffe