1 files changed, 32 insertions, 23 deletions

diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 82811558ec33..2e6bdfea0165 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -25,11 +25,13 @@ struct lifebook_data {
         char phys[32];
 };
 
+static bool lifebook_present;
+
 static const char *desired_serio_phys;
 
-static int lifebook_set_serio_phys(const struct dmi_system_id *d)
+static int lifebook_limit_serio3(const struct dmi_system_id *d)
 {
-        desired_serio_phys = d->driver_data;
+        desired_serio_phys = "isa0060/serio3";
         return 0;
 }
 
@@ -41,53 +43,53 @@ static int lifebook_set_6byte_proto(const struct dmi_system_id *d)
         return 0;
 }
 
-static const struct dmi_system_id lifebook_dmi_table[] = {
+static const struct dmi_system_id __initconst lifebook_dmi_table[] = {
+#if defined(CONFIG_DMI) && defined(CONFIG_X86)
         {
-                .ident = "FLORA-ie 55mi",
+                /* FLORA-ie 55mi */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "FLORA-ie 55mi"),
                 },
         },
         {
-                .ident = "LifeBook B",
+                /* LifeBook B */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B Series"),
                 },
         },
         {
-                .ident = "Lifebook B",
+                /* Lifebook B */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),
                 },
         },
         {
-                .ident = "Lifebook B-2130",
+                /* Lifebook B-2130 */
                 .matches = {
                         DMI_MATCH(DMI_BOARD_NAME, "ZEPHYR"),
                 },
         },
         {
-                .ident = "Lifebook B213x/B2150",
+                /* Lifebook B213x/B2150 */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B2131/B2133/B2150"),
                 },
         },
         {
-                .ident = "Zephyr",
+                /* Zephyr */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "ZEPHYR"),
                 },
         },
         {
-                .ident = "CF-18",
+                /* Panasonic CF-18 */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"),
                 },
-                .callback = lifebook_set_serio_phys,
-                .driver_data = "isa0060/serio3",
+                .callback = lifebook_limit_serio3,
         },
         {
-                .ident = "Panasonic CF-28",
+                /* Panasonic CF-28 */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-28"),
@@ -95,7 +97,7 @@ static const struct dmi_system_id lifebook_dmi_table[] = {
                 .callback = lifebook_set_6byte_proto,
         },
         {
-                .ident = "Panasonic CF-29",
+                /* Panasonic CF-29 */
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
@@ -103,21 +105,27 @@ static const struct dmi_system_id lifebook_dmi_table[] = {
                 .callback = lifebook_set_6byte_proto,
         },
         {
-                .ident = "CF-72",
+                /* Panasonic CF-72 */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"),
                 },
                 .callback = lifebook_set_6byte_proto,
         },
         {
-                .ident = "Lifebook B142",
+                /* Lifebook B142 */
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
                 },
         },
         { }
+#endif
 };
 
+void __init lifebook_module_init(void)
+{
+        lifebook_present = dmi_check_system(lifebook_dmi_table);
+}
+
 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
 {
         struct lifebook_data *priv = psmouse->private;
@@ -198,10 +206,10 @@ static int lifebook_absolute_mode(struct psmouse *psmouse)
                 return -1;
 
         /*
-           Enable absolute output -- ps2_command fails always but if
-           you leave this call out the touchsreen will never send
-           absolute coordinates
-        */
+         * Enable absolute output -- ps2_command fails always but if
+         * you leave this call out the touchsreen will never send
+         * absolute coordinates
+         */
         param = lifebook_use_6byte_proto ? 0x08 : 0x07;
         ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES);
 
@@ -243,7 +251,7 @@ static void lifebook_disconnect(struct psmouse *psmouse)
 
 int lifebook_detect(struct psmouse *psmouse, bool set_properties)
 {
-        if (!dmi_check_system(lifebook_dmi_table))
+        if (!lifebook_present)
                 return -1;
 
         if (desired_serio_phys &&
@@ -283,8 +291,8 @@ static int lifebook_create_relative_device(struct psmouse *psmouse)
 
         dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
         dev2->relbit[BIT_WORD(REL_X)] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
-        dev2->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
-                BIT_MASK(BTN_RIGHT);
+        dev2->keybit[BIT_WORD(BTN_LEFT)] =
+                                BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);
 
         error = input_register_device(priv->dev2);
         if (error)
@@ -309,6 +317,7 @@ int lifebook_init(struct psmouse *psmouse)
 
         dev1->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
         dev1->relbit[0] = 0;
+        dev1->keybit[BIT_WORD(BTN_MOUSE)] = 0;
         dev1->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(dev1, ABS_X, 0, max_coord, 0, 0);
         input_set_abs_params(dev1, ABS_Y, 0, max_coord, 0, 0);