1 files changed, 20 insertions, 21 deletions

diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index 390f1dbb98a4..de745d751162 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -130,14 +130,11 @@ static int ps2pp_cmd(struct psmouse *psmouse, unsigned char *param, unsigned cha
  * 0 - disabled
  */
 
-static void ps2pp_set_smartscroll(struct psmouse *psmouse, unsigned int smartscroll)
+static void ps2pp_set_smartscroll(struct psmouse *psmouse, bool smartscroll)
 {
         struct ps2dev *ps2dev = &psmouse->ps2dev;
         unsigned char param[4];
 
-        if (smartscroll > 1)
-                smartscroll = 1;
-
         ps2pp_cmd(psmouse, param, 0x32);
 
         param[0] = 0;
@@ -149,12 +146,14 @@ static void ps2pp_set_smartscroll(struct psmouse *psmouse, unsigned int smartscr
         ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
 }
 
-static ssize_t ps2pp_attr_show_smartscroll(struct psmouse *psmouse, void *data, char *buf)
+static ssize_t ps2pp_attr_show_smartscroll(struct psmouse *psmouse,
+                                           void *data, char *buf)
 {
-        return sprintf(buf, "%d\n", psmouse->smartscroll ? 1 : 0);
+        return sprintf(buf, "%d\n", psmouse->smartscroll);
 }
 
-static ssize_t ps2pp_attr_set_smartscroll(struct psmouse *psmouse, void *data, const char *buf, size_t count)
+static ssize_t ps2pp_attr_set_smartscroll(struct psmouse *psmouse, void *data,
+                                          const char *buf, size_t count)
 {
         unsigned long value;
 
@@ -261,29 +260,29 @@ static const struct ps2pp_info *get_model_info(unsigned char model)
 
 static void ps2pp_set_model_properties(struct psmouse *psmouse,
                                        const struct ps2pp_info *model_info,
-                                       int using_ps2pp)
+                                       bool using_ps2pp)
 {
         struct input_dev *input_dev = psmouse->dev;
 
         if (model_info->features & PS2PP_SIDE_BTN)
-                set_bit(BTN_SIDE, input_dev->keybit);
+                __set_bit(BTN_SIDE, input_dev->keybit);
 
         if (model_info->features & PS2PP_EXTRA_BTN)
-                set_bit(BTN_EXTRA, input_dev->keybit);
+                __set_bit(BTN_EXTRA, input_dev->keybit);
 
         if (model_info->features & PS2PP_TASK_BTN)
-                set_bit(BTN_TASK, input_dev->keybit);
+                __set_bit(BTN_TASK, input_dev->keybit);
 
         if (model_info->features & PS2PP_NAV_BTN) {
-                set_bit(BTN_FORWARD, input_dev->keybit);
-                set_bit(BTN_BACK, input_dev->keybit);
+                __set_bit(BTN_FORWARD, input_dev->keybit);
+                __set_bit(BTN_BACK, input_dev->keybit);
         }
 
         if (model_info->features & PS2PP_WHEEL)
-                set_bit(REL_WHEEL, input_dev->relbit);
+                __set_bit(REL_WHEEL, input_dev->relbit);
 
         if (model_info->features & PS2PP_HWHEEL)
-                set_bit(REL_HWHEEL, input_dev->relbit);
+                __set_bit(REL_HWHEEL, input_dev->relbit);
 
         switch (model_info->kind) {
                 case PS2PP_KIND_WHEEL:
@@ -321,13 +320,13 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse,
  * that support it.
  */
 
-int ps2pp_init(struct psmouse *psmouse, int set_properties)
+int ps2pp_init(struct psmouse *psmouse, bool set_properties)
 {
         struct ps2dev *ps2dev = &psmouse->ps2dev;
         unsigned char param[4];
         unsigned char model, buttons;
         const struct ps2pp_info *model_info;
-        int use_ps2pp = 0;
+        bool use_ps2pp = false;
         int error;
 
         param[0] = 0;
@@ -364,7 +363,7 @@ int ps2pp_init(struct psmouse *psmouse, int set_properties)
                         param[0] = 0;
                         if (!ps2_command(ps2dev, param, 0x13d1) &&
                             param[0] == 0x06 && param[1] == 0x00 && param[2] == 0x14) {
-                                use_ps2pp = 1;
+                                use_ps2pp = true;
                         }
 
                 } else {
@@ -376,8 +375,8 @@ int ps2pp_init(struct psmouse *psmouse, int set_properties)
                         if ((param[0] & 0x78) == 0x48 &&
                             (param[1] & 0xf3) == 0xc2 &&
                             (param[2] & 0x03) == ((param[1] >> 2) & 3)) {
-                                ps2pp_set_smartscroll(psmouse, psmouse->smartscroll);
-                                use_ps2pp = 1;
+                                ps2pp_set_smartscroll(psmouse, false);
+                                use_ps2pp = true;
                         }
                 }
         }
@@ -406,7 +405,7 @@ int ps2pp_init(struct psmouse *psmouse, int set_properties)
                 }
 
                 if (buttons < 3)
-                        clear_bit(BTN_MIDDLE, psmouse->dev->keybit);
+                        __clear_bit(BTN_MIDDLE, psmouse->dev->keybit);
 
                 if (model_info)
                         ps2pp_set_model_properties(psmouse, model_info, use_ps2pp);