ARM: SAMSUNG: Removing dependency on CONFIG_PM_DEBUG for clock debugging

Message ID 1297530374-32635-1-git-send-email-amit.kachhap@linaro.org
State New
Headers show

Commit Message

Amit Daniel Kachhap Feb. 12, 2011, 5:06 p.m.
Enabling the macro CONFIG_PM_DEBUG is causing compilation error as all PM components
are included which is not in mainline for samsung V310 platform, therefore, this patch
removes the dependency on macro CONFIG_PM_DEBUG for clock debugging through debugfs
interface.

Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org>
---
 arch/arm/plat-samsung/clock.c              |    4 ++--
 arch/arm/plat-samsung/include/plat/clock.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Amit Daniel Kachhap Feb. 11, 2011, 9:22 a.m. | #1
yes this is a temporary patch untill all the PM
components(sleep/resume) are mainlined.
The exact compilation error is,

 CC      arch/arm/plat-samsung/pm.o
arch/arm/plat-samsung/pm.c:32: fatal error: mach/pm-core.h: No such
file or directory
compilation terminated.
make[1]: *** [arch/arm/plat-samsung/pm.o] Error 1

Thanks,
Amit Daniel


On 11 February 2011 02:57, Amit Kucheria <amit.kucheria@linaro.org> wrote:
>
> On Sat, Feb 12, 2011 at 7:06 PM, Amit Daniel Kachhap
> <amit.kachhap@linaro.org> wrote:
> > Enabling the macro CONFIG_PM_DEBUG is causing compilation error as all PM components
> > are included which is not in mainline for samsung V310 platform, therefore, this patch
> > removes the dependency on macro CONFIG_PM_DEBUG for clock debugging through debugfs
> > interface.
>
> What is the exact error? Might be helpful to have it in the patch description.
>
> Presumably, this is a temporary patch until PM components
> (suspend/resume hooks?) are mainlined and then we can put all this
> back under PM_DEBUG? In that case, it might be a good idea to mark it
> as such.
>
> Regards,
> Amit
>
> > Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org>
> > ---
> >  arch/arm/plat-samsung/clock.c              |    4 ++--
> >  arch/arm/plat-samsung/include/plat/clock.h |    2 +-
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
> > index 7728928..aca5a25 100644
> > --- a/arch/arm/plat-samsung/clock.c
> > +++ b/arch/arm/plat-samsung/clock.c
> > @@ -450,7 +450,7 @@ int __init s3c24xx_register_baseclocks(unsigned long xtal)
> >        return 0;
> >  }
> >
> > -#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
> > +#if defined(CONFIG_DEBUG_FS)
> >  /* debugfs support to trace clock tree hierarchy and attributes */
> >
> >  static struct dentry *clk_debugfs_root;
> > @@ -538,4 +538,4 @@ err_out:
> >  }
> >  late_initcall(clk_debugfs_init);
> >
> > -#endif /* defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) */
> > +#endif /* defined(CONFIG_DEBUG_FS) */
> > diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
> > index 9a82b88..f6180ab 100644
> > --- a/arch/arm/plat-samsung/include/plat/clock.h
> > +++ b/arch/arm/plat-samsung/include/plat/clock.h
> > @@ -47,7 +47,7 @@ struct clk {
> >
> >        struct clk_ops          *ops;
> >        int                 (*enable)(struct clk *, int enable);
> > -#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
> > +#if defined(CONFIG_DEBUG_FS)
> >        struct dentry           *dent;  /* For visible tree hierarchy */
> >  #endif
> >  };
> > --
> > 1.7.1
> >
> >
> > _______________________________________________
> > linaro-dev mailing list
> > linaro-dev@lists.linaro.org
> > http://lists.linaro.org/mailman/listinfo/linaro-dev
> >
Amit Kucheria Feb. 11, 2011, 1:27 p.m. | #2
On Fri, Feb 11, 2011 at 11:22 AM, Amit Kachhap <amit.kachhap@linaro.org> wrote:
> yes this is a temporary patch untill all the PM
> components(sleep/resume) are mainlined.
> The exact compilation error is,
>
>  CC      arch/arm/plat-samsung/pm.o
> arch/arm/plat-samsung/pm.c:32: fatal error: mach/pm-core.h: No such
> file or directory
>
> compilation terminated.
> make[1]: *** [arch/arm/plat-samsung/pm.o] Error 1

Your patch is just masking the real problem in that case. Do you
really need to include mach/pm-core.h in plat-samsung/pm.c?

So the real problem seems to be that the platform hasn't been
test-compiled with CONFIG_PM enabled perhaps?

/Amit

> Thanks,
> Amit Daniel
>
>
> On 11 February 2011 02:57, Amit Kucheria <amit.kucheria@linaro.org> wrote:
>>
>> On Sat, Feb 12, 2011 at 7:06 PM, Amit Daniel Kachhap
>> <amit.kachhap@linaro.org> wrote:
>> > Enabling the macro CONFIG_PM_DEBUG is causing compilation error as all PM components
>> > are included which is not in mainline for samsung V310 platform, therefore, this patch
>> > removes the dependency on macro CONFIG_PM_DEBUG for clock debugging through debugfs
>> > interface.
>>
>> What is the exact error? Might be helpful to have it in the patch description.
>>
>> Presumably, this is a temporary patch until PM components
>> (suspend/resume hooks?) are mainlined and then we can put all this
>> back under PM_DEBUG? In that case, it might be a good idea to mark it
>> as such.
>>
>> Regards,
>> Amit

Patch

diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index 7728928..aca5a25 100644
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -450,7 +450,7 @@  int __init s3c24xx_register_baseclocks(unsigned long xtal)
 	return 0;
 }
 
-#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FS)
 /* debugfs support to trace clock tree hierarchy and attributes */
 
 static struct dentry *clk_debugfs_root;
@@ -538,4 +538,4 @@  err_out:
 }
 late_initcall(clk_debugfs_init);
 
-#endif /* defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) */
+#endif /* defined(CONFIG_DEBUG_FS) */
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
index 9a82b88..f6180ab 100644
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
@@ -47,7 +47,7 @@  struct clk {
 
 	struct clk_ops		*ops;
 	int		    (*enable)(struct clk *, int enable);
-#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FS)
 	struct dentry		*dent;	/* For visible tree hierarchy */
 #endif
 };