Patchwork mtd: mxc_nand: fix built breakage

login
register
mail settings
Submitter Daniel Mack
Date May 13, 2009, 3:43 p.m.
Message ID <1242229410-11853-1-git-send-email-daniel@caiaq.de>
Download mbox | patch
Permalink /patch/27154/
State Accepted, archived
Headers show

Comments

Daniel Mack - May 13, 2009, 3:43 p.m.
The MXC NAND driver does not currently build with CONFIG_PM set.

  drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_suspend':
  drivers/mtd/nand/mxc_nand.c:1021: error: 'nfc_clk' undeclared (first use in this function)
  drivers/mtd/nand/mxc_nand.c:1021: error: (Each undeclared identifier is reported only once
  drivers/mtd/nand/mxc_nand.c:1021: error: for each function it appears in.)
  drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_resume':
  drivers/mtd/nand/mxc_nand.c:1033: error: 'nfc_clk' undeclared (first use in this function)
  make[3]: *** [drivers/mtd/nand/mxc_nand.o] Error 1
  make[2]: *** [drivers/mtd/nand] Error 2
  make[1]: *** [drivers/mtd] Error 2
  make: *** [drivers] Error 2

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Linux MTD list <linux-mtd@lists.infradead.org>
---
 drivers/mtd/nand/mxc_nand.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
Vladimir Barinov - May 13, 2009, 4:09 p.m.
Hello Daniel,

Please find the patch that I've sent some time ago. This patch should 
fix the issue you described.
http://lists.infradead.org/pipermail/linux-mtd/2009-April/025363.html

Vladimir

Daniel Mack wrote:
> The MXC NAND driver does not currently build with CONFIG_PM set.
>
>   drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_suspend':
>   drivers/mtd/nand/mxc_nand.c:1021: error: 'nfc_clk' undeclared (first use in this function)
>   drivers/mtd/nand/mxc_nand.c:1021: error: (Each undeclared identifier is reported only once
>   drivers/mtd/nand/mxc_nand.c:1021: error: for each function it appears in.)
>   drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_resume':
>   drivers/mtd/nand/mxc_nand.c:1033: error: 'nfc_clk' undeclared (first use in this function)
>   make[3]: *** [drivers/mtd/nand/mxc_nand.o] Error 1
>   make[2]: *** [drivers/mtd/nand] Error 2
>   make[1]: *** [drivers/mtd] Error 2
>   make: *** [drivers] Error 2
>
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Linux MTD list <linux-mtd@lists.infradead.org>
> ---
>  drivers/mtd/nand/mxc_nand.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
> index 21fd4f1..d352d2a 100644
> --- a/drivers/mtd/nand/mxc_nand.c
> +++ b/drivers/mtd/nand/mxc_nand.c
> @@ -1011,6 +1011,8 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
>  static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
>  {
>  	struct mtd_info *info = platform_get_drvdata(pdev);
> +        struct nand_chip *nand_chip = info->priv;
>   
> +	struct mxc_nand_host *host = nand_chip->priv;
>  	int ret = 0;
>  
>  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
> @@ -1018,7 +1020,7 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
>  		ret = info->suspend(info);
>  
>  	/* Disable the NFC clock */
> -	clk_disable(nfc_clk);	/* FIXME */
> +	clk_disable(host->clk);	/* FIXME */
>  
>  	return ret;
>  }
> @@ -1026,11 +1028,13 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
>  static int mxcnd_resume(struct platform_device *pdev)
>  {
>  	struct mtd_info *info = platform_get_drvdata(pdev);
> +        struct nand_chip *nand_chip = info->priv;
> +	struct mxc_nand_host *host = nand_chip->priv;
>  	int ret = 0;
>  
>  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
>  	/* Enable the NFC clock */
> -	clk_enable(nfc_clk);	/* FIXME */
> +	clk_enable(host->clk);	/* FIXME */
>  
>  	if (info)
>  		info->resume(info);
>
Daniel Mack - May 13, 2009, 4:11 p.m.
On Wed, May 13, 2009 at 08:09:43PM +0400, Vladimir Barinov wrote:
> Please find the patch that I've sent some time ago. This patch should  
> fix the issue you described.
> http://lists.infradead.org/pipermail/linux-mtd/2009-April/025363.html


Ah, ok, thanks.

Did anyone pick it up for mainline already?
Sascha, I didn't see that one in your tree either.

Daniel


> Daniel Mack wrote:
>> The MXC NAND driver does not currently build with CONFIG_PM set.
>>
>>   drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_suspend':
>>   drivers/mtd/nand/mxc_nand.c:1021: error: 'nfc_clk' undeclared (first use in this function)
>>   drivers/mtd/nand/mxc_nand.c:1021: error: (Each undeclared identifier is reported only once
>>   drivers/mtd/nand/mxc_nand.c:1021: error: for each function it appears in.)
>>   drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_resume':
>>   drivers/mtd/nand/mxc_nand.c:1033: error: 'nfc_clk' undeclared (first use in this function)
>>   make[3]: *** [drivers/mtd/nand/mxc_nand.o] Error 1
>>   make[2]: *** [drivers/mtd/nand] Error 2
>>   make[1]: *** [drivers/mtd] Error 2
>>   make: *** [drivers] Error 2
>>
>> Signed-off-by: Daniel Mack <daniel@caiaq.de>
>> Cc: Sascha Hauer <s.hauer@pengutronix.de>
>> Cc: Linux MTD list <linux-mtd@lists.infradead.org>
>> ---
>>  drivers/mtd/nand/mxc_nand.c |    8 ++++++--
>>  1 files changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
>> index 21fd4f1..d352d2a 100644
>> --- a/drivers/mtd/nand/mxc_nand.c
>> +++ b/drivers/mtd/nand/mxc_nand.c
>> @@ -1011,6 +1011,8 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
>>  static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
>>  {
>>  	struct mtd_info *info = platform_get_drvdata(pdev);
>> +        struct nand_chip *nand_chip = info->priv;
>>   +	struct mxc_nand_host *host = nand_chip->priv;
>>  	int ret = 0;
>>   	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
>> @@ -1018,7 +1020,7 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
>>  		ret = info->suspend(info);
>>   	/* Disable the NFC clock */
>> -	clk_disable(nfc_clk);	/* FIXME */
>> +	clk_disable(host->clk);	/* FIXME */
>>   	return ret;
>>  }
>> @@ -1026,11 +1028,13 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
>>  static int mxcnd_resume(struct platform_device *pdev)
>>  {
>>  	struct mtd_info *info = platform_get_drvdata(pdev);
>> +        struct nand_chip *nand_chip = info->priv;
>> +	struct mxc_nand_host *host = nand_chip->priv;
>>  	int ret = 0;
>>   	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
>>  	/* Enable the NFC clock */
>> -	clk_enable(nfc_clk);	/* FIXME */
>> +	clk_enable(host->clk);	/* FIXME */
>>   	if (info)
>>  		info->resume(info);
>>   
>
Sascha Hauer - May 14, 2009, 6:56 a.m.
On Wed, May 13, 2009 at 06:11:54PM +0200, Daniel Mack wrote:
> On Wed, May 13, 2009 at 08:09:43PM +0400, Vladimir Barinov wrote:
> > Please find the patch that I've sent some time ago. This patch should  
> > fix the issue you described.
> > http://lists.infradead.org/pipermail/linux-mtd/2009-April/025363.html
> 
> 
> Ah, ok, thanks.
> 
> Did anyone pick it up for mainline already?
> Sascha, I didn't see that one in your tree either.

It seems to be pure luck when the patches on the mtd list get picked up.
Most of the time I do not even a reaction from the list or David. I
wonder if someone will beat me up when I take the i.MX nand patches via
my arm tree.

Sascha

> 
> Daniel
> 
> 
> > Daniel Mack wrote:
> >> The MXC NAND driver does not currently build with CONFIG_PM set.
> >>
> >>   drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_suspend':
> >>   drivers/mtd/nand/mxc_nand.c:1021: error: 'nfc_clk' undeclared (first use in this function)
> >>   drivers/mtd/nand/mxc_nand.c:1021: error: (Each undeclared identifier is reported only once
> >>   drivers/mtd/nand/mxc_nand.c:1021: error: for each function it appears in.)
> >>   drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_resume':
> >>   drivers/mtd/nand/mxc_nand.c:1033: error: 'nfc_clk' undeclared (first use in this function)
> >>   make[3]: *** [drivers/mtd/nand/mxc_nand.o] Error 1
> >>   make[2]: *** [drivers/mtd/nand] Error 2
> >>   make[1]: *** [drivers/mtd] Error 2
> >>   make: *** [drivers] Error 2
> >>
> >> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> >> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> >> Cc: Linux MTD list <linux-mtd@lists.infradead.org>
> >> ---
> >>  drivers/mtd/nand/mxc_nand.c |    8 ++++++--
> >>  1 files changed, 6 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
> >> index 21fd4f1..d352d2a 100644
> >> --- a/drivers/mtd/nand/mxc_nand.c
> >> +++ b/drivers/mtd/nand/mxc_nand.c
> >> @@ -1011,6 +1011,8 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
> >>  static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
> >>  {
> >>  	struct mtd_info *info = platform_get_drvdata(pdev);
> >> +        struct nand_chip *nand_chip = info->priv;
> >>   +	struct mxc_nand_host *host = nand_chip->priv;
> >>  	int ret = 0;
> >>   	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
> >> @@ -1018,7 +1020,7 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
> >>  		ret = info->suspend(info);
> >>   	/* Disable the NFC clock */
> >> -	clk_disable(nfc_clk);	/* FIXME */
> >> +	clk_disable(host->clk);	/* FIXME */
> >>   	return ret;
> >>  }
> >> @@ -1026,11 +1028,13 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
> >>  static int mxcnd_resume(struct platform_device *pdev)
> >>  {
> >>  	struct mtd_info *info = platform_get_drvdata(pdev);
> >> +        struct nand_chip *nand_chip = info->priv;
> >> +	struct mxc_nand_host *host = nand_chip->priv;
> >>  	int ret = 0;
> >>   	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
> >>  	/* Enable the NFC clock */
> >> -	clk_enable(nfc_clk);	/* FIXME */
> >> +	clk_enable(host->clk);	/* FIXME */
> >>   	if (info)
> >>  		info->resume(info);
> >>   
> >
>
Artem Bityutskiy - May 14, 2009, 7:01 a.m.
On Thu, 2009-05-14 at 08:56 +0200, Sascha Hauer wrote:
> On Wed, May 13, 2009 at 06:11:54PM +0200, Daniel Mack wrote:
> > On Wed, May 13, 2009 at 08:09:43PM +0400, Vladimir Barinov wrote:
> > > Please find the patch that I've sent some time ago. This patch should  
> > > fix the issue you described.
> > > http://lists.infradead.org/pipermail/linux-mtd/2009-April/025363.html
> > 
> > 
> > Ah, ok, thanks.
> > 
> > Did anyone pick it up for mainline already?
> > Sascha, I didn't see that one in your tree either.
> 
> It seems to be pure luck when the patches on the mtd list get picked up.
> Most of the time I do not even a reaction from the list or David. I
> wonder if someone will beat me up when I take the i.MX nand patches via
> my arm tree.

I've put Vladimir's patch to my l2-mtd-2.6.git tree:
http://git.infradead.org/users/dedekind/l2-mtd-2.6.git

which means I'll be pinging David about pulling it. This is all
I can do for you, unfortunately.
Sascha Hauer - May 14, 2009, 7:45 a.m.
On Thu, May 14, 2009 at 10:01:19AM +0300, Artem Bityutskiy wrote:
> On Thu, 2009-05-14 at 08:56 +0200, Sascha Hauer wrote:
> > On Wed, May 13, 2009 at 06:11:54PM +0200, Daniel Mack wrote:
> > > On Wed, May 13, 2009 at 08:09:43PM +0400, Vladimir Barinov wrote:
> > > > Please find the patch that I've sent some time ago. This patch should  
> > > > fix the issue you described.
> > > > http://lists.infradead.org/pipermail/linux-mtd/2009-April/025363.html
> > > 
> > > 
> > > Ah, ok, thanks.
> > > 
> > > Did anyone pick it up for mainline already?
> > > Sascha, I didn't see that one in your tree either.
> > 
> > It seems to be pure luck when the patches on the mtd list get picked up.
> > Most of the time I do not even a reaction from the list or David. I
> > wonder if someone will beat me up when I take the i.MX nand patches via
> > my arm tree.
> 
> I've put Vladimir's patch to my l2-mtd-2.6.git tree:
> http://git.infradead.org/users/dedekind/l2-mtd-2.6.git
> 
> which means I'll be pinging David about pulling it. This is all
> I can do for you, unfortunately.

Thanks a lot. I really prefer driver patches going over the according
subsystem tree rather then leaking them in from the architecture tree.

Sascha

Patch

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 21fd4f1..d352d2a 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1011,6 +1011,8 @@  static int __devexit mxcnd_remove(struct platform_device *pdev)
 static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
 {
 	struct mtd_info *info = platform_get_drvdata(pdev);
+        struct nand_chip *nand_chip = info->priv;
+	struct mxc_nand_host *host = nand_chip->priv;
 	int ret = 0;
 
 	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
@@ -1018,7 +1020,7 @@  static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
 		ret = info->suspend(info);
 
 	/* Disable the NFC clock */
-	clk_disable(nfc_clk);	/* FIXME */
+	clk_disable(host->clk);	/* FIXME */
 
 	return ret;
 }
@@ -1026,11 +1028,13 @@  static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
 static int mxcnd_resume(struct platform_device *pdev)
 {
 	struct mtd_info *info = platform_get_drvdata(pdev);
+        struct nand_chip *nand_chip = info->priv;
+	struct mxc_nand_host *host = nand_chip->priv;
 	int ret = 0;
 
 	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
 	/* Enable the NFC clock */
-	clk_enable(nfc_clk);	/* FIXME */
+	clk_enable(host->clk);	/* FIXME */
 
 	if (info)
 		info->resume(info);