platform/x86: touchscreen_dmi: Fix indentation in several places

1. Put on one line PROPERTY_ENTRY_STRING("firmware-name", ...) lines. In most
   cases this doesn't over the limit, the rest is pretty much obvious from
   reading point of view.
2. Put on one line DMI_MATCH() parameters, we already have over the limit lines.
3. Reduce indentation of function parameters.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c
index 2dbe4a3..93177e6 100644 (file)
--- a/drivers/platform/x86/touchscreen_dmi.c
+++ b/drivers/platform/x86/touchscreen_dmi.c
@@ -219,8 +219,7 @@ static const struct property_entry digma_citi_e200_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1686-digma_citi_e200.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1686-digma_citi_e200.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -236,8 +235,7 @@ static const struct property_entry gp_electronic_t701_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-y", 640),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-gp-electronic-t701.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-gp-electronic-t701.fw"),
        { }
 };
 
@@ -382,8 +380,7 @@ static const struct property_entry onda_v80_plus_v3_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1698),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3676-onda-v80-plus-v3.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-onda-v80-plus-v3.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -398,8 +395,7 @@ static const struct property_entry onda_v820w_32g_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1665),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-onda-v820w-32g.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-onda-v820w-32g.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -415,8 +411,7 @@ static const struct property_entry onda_v891w_v1_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-min-y",  8),
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1676),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1130),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3680-onda-v891w-v1.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3680-onda-v891w-v1.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -433,8 +428,7 @@ static const struct property_entry onda_v891w_v3_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1625),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1135),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3676-onda-v891w-v3.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-onda-v891w-v3.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -450,8 +444,7 @@ static const struct property_entry pipo_w2s_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-y", 880),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-pipo-w2s.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-pipo-w2s.fw"),
        { }
 };
 
@@ -465,8 +458,7 @@ static const struct property_entry pipo_w11_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-min-y", 15),
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1984),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1532),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-pipo-w11.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-pipo-w11.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -483,8 +475,7 @@ static const struct property_entry pov_mobii_wintab_p800w_v20_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1692),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1146),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3680-pov-mobii-wintab-p800w-v20.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3680-pov-mobii-wintab-p800w-v20.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -501,8 +492,7 @@ static const struct property_entry pov_mobii_wintab_p800w_v21_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1794),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1148),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3692-pov-mobii-wintab-p800w.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3692-pov-mobii-wintab-p800w.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -519,8 +509,7 @@ static const struct property_entry pov_mobii_wintab_p1006w_v10_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1984),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1520),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3692-pov-mobii-wintab-p1006w-v10.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3692-pov-mobii-wintab-p1006w-v10.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -537,8 +526,7 @@ static const struct property_entry schneider_sct101ctm_props[] = {
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
        PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-schneider-sct101ctm.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-schneider-sct101ctm.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -568,8 +556,7 @@ static const struct property_entry teclast_x98plus2_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1280),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1686-teclast_x98plus2.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1686-teclast_x98plus2.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        { }
 };
@@ -583,8 +570,7 @@ static const struct property_entry trekstor_primebook_c11_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1970),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1530),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-trekstor-primebook-c11.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-trekstor-primebook-c11.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -598,8 +584,7 @@ static const struct ts_dmi_data trekstor_primebook_c11_data = {
 static const struct property_entry trekstor_primebook_c13_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 2624),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1920),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-trekstor-primebook-c13.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-trekstor-primebook-c13.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -613,8 +598,7 @@ static const struct ts_dmi_data trekstor_primebook_c13_data = {
 static const struct property_entry trekstor_primetab_t13b_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 2500),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1900),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1680-trekstor-primetab-t13b.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-trekstor-primetab-t13b.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
@@ -630,8 +614,7 @@ static const struct property_entry trekstor_surftab_twin_10_1_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1900),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1280),
        PROPERTY_ENTRY_U32("touchscreen-inverted-y", 1),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl3670-surftab-twin-10-1-st10432-8.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl3670-surftab-twin-10-1-st10432-8.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        { }
 };
@@ -646,8 +629,7 @@ static const struct property_entry trekstor_surftab_wintron70_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-min-y", 8),
        PROPERTY_ENTRY_U32("touchscreen-size-x", 884),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 632),
-       PROPERTY_ENTRY_STRING("firmware-name",
-                             "gsl1686-surftab-wintron70-st70416-6.fw"),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1686-surftab-wintron70-st70416-6.fw"),
        PROPERTY_ENTRY_U32("silead,max-fingers", 10),
        PROPERTY_ENTRY_BOOL("silead,home-button"),
        { }
@@ -933,8 +915,7 @@ static const struct dmi_system_id touchscreen_dmi_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "PIPO"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "To be filled by O.E.M."),
                        /* Above matches are too generic, add bios-ver match */
-                       DMI_MATCH(DMI_BIOS_VERSION,
-                                 "JS-BI-10.6-SF133GR300-GA55B-024-F"),
+                       DMI_MATCH(DMI_BIOS_VERSION, "JS-BI-10.6-SF133GR300-GA55B-024-F"),
                },
        },
        {
@@ -1060,8 +1041,7 @@ static const struct dmi_system_id touchscreen_dmi_table[] = {
                .driver_data = (void *)&trekstor_surftab_wintron70_data,
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "TrekStor"),
-                       DMI_MATCH(DMI_PRODUCT_NAME,
-                                            "SurfTab wintron 7.0 ST70416-6"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "SurfTab wintron 7.0 ST70416-6"),
                        /* Exact match, different versions need different fw */
                        DMI_MATCH(DMI_BIOS_VERSION, "TREK.G.WI71C.JGBMRBA05"),
                },
@@ -1093,7 +1073,7 @@ static void ts_dmi_add_props(struct i2c_client *client)
 }
 
 static int ts_dmi_notifier_call(struct notifier_block *nb,
-                                      unsigned long action, void *data)
+                               unsigned long action, void *data)
 {
        struct device *dev = data;
        struct i2c_client *client;