ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data

There are certain fields inside 'struct dpll_data' which are
included under ARCH_OMAP3 and ARCH_OMAP4 option, which makes it
difficult to use it for new devices like, am33xx, ti81xx, etc...

So remove the ifdef completely, this will add few fields to the struct
unused, but it improves readability and maintainability of the code.

Signed-off-by: Kevin Hilman <[email protected]>
[[email protected]: wrote detailed changelog]
Signed-off-by: Vaibhav Hiremath <[email protected]>
Cc: Tony Lindgren <[email protected]>
Cc: Paul Walmsley <[email protected]>
Cc: Santosh Shilimkar <[email protected]>
Cc: R Sricharan <[email protected]>
Acked-by: Santosh Shilimkar <[email protected]>
Signed-off-by: Paul Walmsley <[email protected]>

diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h
index d0ef57c1d71b8d674fd649342f3241eed5d0ba53..656b9862279e7f757e9e1328a81279f20ef3b7e7 100644 (file)
--- a/arch/arm/plat-omap/include/plat/clock.h
+++ b/arch/arm/plat-omap/include/plat/clock.h
@@ -156,7 +156,6 @@ struct dpll_data {
        u8                      min_divider;
        u16                     max_divider;
        u8                      modes;
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
        void __iomem            *autoidle_reg;
        void __iomem            *idlest_reg;
        u32                     autoidle_mask;
@@ -167,7 +166,6 @@ struct dpll_data {
        u8                      auto_recal_bit;
        u8                      recal_en_bit;
        u8                      recal_st_bit;
-#  endif
        u8                      flags;
 };