On Wed, Sep 24, 2008 at 9:21 AM, Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx> wrote: > Hi, > > How about introducing a new typedef in order to accommodate the > different size of enable_regs without ifdefs? > > I think that this is apparently the case categorized into (a) in > 'CodyingStyle'. I am not sure which is the right way to do. Is this what you meant? arch/arm/plat-omap/include/mach/clock.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-omap/include/mach/clock.h b/arch/arm/plat-omap/include/mach/clock.h index f26ad8c..122532e 100644 --- a/arch/arm/plat-omap/include/mach/clock.h +++ b/arch/arm/plat-omap/include/mach/clock.h @@ -59,6 +59,12 @@ struct dpll_data { #endif +#if defined(CONFIG_ARCH_OMAP1) +typedef void __iomem *reg_t; +#elif +typedef u16 reg_t; +#endif + struct clk { struct list_head node; struct module *owner; @@ -67,7 +73,7 @@ struct clk { struct clk *parent; unsigned long rate; __u32 flags; - u16 enable_reg; + reg_t enable_reg; __u8 enable_bit; __s8 usecount; u8 idlest_bit; Regards Arun > > Hiroshi DOYU > > From: "ext Arun KS" <arunks@xxxxxxxxxxxxxxxxxxxx> > Subject: [PATCH] Temporary fix to boot OMAP1 based boards > Date: Tue, 23 Sep 2008 20:53:09 +0530 > >> This patch is a temporary fix for a kernel panic causing at omap1_clk_init >> >> Signed-off-by: Arun KS <arunks@xxxxxxxxxxxxxxxxxxxx> >> --- >> arch/arm/plat-omap/include/mach/clock.h | 4 ++++ >> 1 files changed, 4 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/plat-omap/include/mach/clock.h >> b/arch/arm/plat-omap/include/mach/clock.h >> index f26ad8c..b9c471e 100644 >> --- a/arch/arm/plat-omap/include/mach/clock.h >> +++ b/arch/arm/plat-omap/include/mach/clock.h >> @@ -67,7 +67,11 @@ struct clk { >> struct clk *parent; >> unsigned long rate; >> __u32 flags; >> +#if defined(CONFIG_ARCH_OMAP1) >> + void __iomem *enable_reg; >> +#elif >> u16 enable_reg; >> +#endif >> __u8 enable_bit; >> __s8 usecount; >> u8 idlest_bit; >> -- >> 1.5.3.4 >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-omap" in >> the body of a message to majordomo@xxxxxxxxxxxxxxx >> More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html