mfd: mc13xxx: Move definitions out of structures

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index a326c85..d63b1d3 100644 (file)
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS   6
 
-struct mc13xxx_leds_platform_data {
-       struct mc13xxx_led_platform_data *led;
-       int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE          (1 << 0)
 #define MC13783_LED_C0_TRIODE_MD       (1 << 7)
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */
 #define MC34708_LED_C0_CURRENT_R(x)    (((x) & 0x3) << 9)
 #define MC34708_LED_C0_CURRENT_G(x)    (((x) & 0x3) << 21)
+
+struct mc13xxx_leds_platform_data {
+       struct mc13xxx_led_platform_data *led;
+       int num_leds;
        u32 led_control[MAX_LED_CONTROL_REGS];
 };
 
-struct mc13xxx_buttons_platform_data {
 #define MC13783_BUTTON_DBNC_0MS                0
 #define MC13783_BUTTON_DBNC_30MS       1
 #define MC13783_BUTTON_DBNC_150MS      2
@@ -180,6 +179,8 @@ struct mc13xxx_buttons_platform_data {
 #define MC13783_BUTTON_ENABLE          (1 << 2)
 #define MC13783_BUTTON_POL_INVERT      (1 << 3)
 #define MC13783_BUTTON_RESET_EN                (1 << 4)
+
+struct mc13xxx_buttons_platform_data {
        int b1on_flags;
        unsigned short b1on_key;
        int b2on_flags;
@@ -188,14 +189,14 @@ struct mc13xxx_buttons_platform_data {
        unsigned short b3on_key;
 };
 
+#define MC13783_TS_ATO_FIRST   false
+#define MC13783_TS_ATO_EACH    true
+
 struct mc13xxx_ts_platform_data {
        /* Delay between Touchscreen polarization and ADC Conversion.
         * Given in clock ticks of a 32 kHz clock which gives a granularity of
         * about 30.5ms */
        u8 ato;
-
-#define MC13783_TS_ATO_FIRST false
-#define MC13783_TS_ATO_EACH  true
        /* Use the ATO delay only for the first conversion or for each one */
        bool atox;
 };
@@ -210,11 +211,12 @@ struct mc13xxx_codec_platform_data {
        enum mc13783_ssi_port dac_ssi_port;
 };
 
-struct mc13xxx_platform_data {
-#define MC13XXX_USE_TOUCHSCREEN (1 << 0)
+#define MC13XXX_USE_TOUCHSCREEN        (1 << 0)
 #define MC13XXX_USE_CODEC      (1 << 1)
 #define MC13XXX_USE_ADC                (1 << 2)
 #define MC13XXX_USE_RTC                (1 << 3)
+
+struct mc13xxx_platform_data {
        unsigned int flags;
 
        struct mc13xxx_regulator_platform_data regulators;