get rid of input BIT* duplicate defines

get rid of input BIT* duplicate defines

use newly global defined macros for input layer. Also remove includes of
input.h from non-input sources only for BIT macro definiton. Define the
macro temporarily in local manner, all those local definitons will be
removed further in this patchset (to not break bisecting).
BIT macro will be globally defined (1<<x)

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: <dtor@mail.ru>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Cc: <lenb@kernel.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Cc: <perex@suse.cz>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: <vernux@us.ibm.com>
Cc: <malattia@linux.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 files changed, 55 insertions, 45 deletions

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 64d70a9b714c..2b5ed119c9a9 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -455,24 +455,25 @@ int alps_init(struct psmouse *psmouse)
         if (alps_hw_init(psmouse, &version))
                 goto init_fail;
 
-        dev1->evbit[LONG(EV_KEY)] |= BIT(EV_KEY);
-        dev1->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
-        dev1->keybit[LONG(BTN_TOOL_FINGER)] |= BIT(BTN_TOOL_FINGER);
-        dev1->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
+        dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
+        dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);
+        dev1->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
 
-        dev1->evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
+        dev1->evbit[BIT_WORD(EV_ABS)] |= BIT_MASK(EV_ABS);
         input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0);
         input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0);
         input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0);
 
         if (priv->i->flags & ALPS_WHEEL) {
-                dev1->evbit[LONG(EV_REL)] |= BIT(EV_REL);
-                dev1->relbit[LONG(REL_WHEEL)] |= BIT(REL_WHEEL);
+                dev1->evbit[BIT_WORD(EV_REL)] |= BIT_MASK(EV_REL);
+                dev1->relbit[BIT_WORD(REL_WHEEL)] |= BIT_MASK(REL_WHEEL);
         }
 
         if (priv->i->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
-                dev1->keybit[LONG(BTN_FORWARD)] |= BIT(BTN_FORWARD);
-                dev1->keybit[LONG(BTN_BACK)] |= BIT(BTN_BACK);
+                dev1->keybit[BIT_WORD(BTN_FORWARD)] |= BIT_MASK(BTN_FORWARD);
+                dev1->keybit[BIT_WORD(BTN_BACK)] |= BIT_MASK(BTN_BACK);
         }
 
         snprintf(priv->phys, sizeof(priv->phys), "%s/input1", psmouse->ps2dev.serio->phys);
@@ -483,9 +484,10 @@ int alps_init(struct psmouse *psmouse)
         dev2->id.product = PSMOUSE_ALPS;
         dev2->id.version = 0x0000;
 
-        dev2->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        dev2->relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y);
-        dev2->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        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_MIDDLE) | BIT_MASK(BTN_RIGHT);
 
         if (input_register_device(priv->dev2))
                 goto init_fail;
diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c
index 239a0e16d91a..a185ac78a42c 100644
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
@@ -111,9 +111,10 @@ static int __init amimouse_init(void)
         amimouse_dev->id.product = 0x0002;
         amimouse_dev->id.version = 0x0100;
 
-        amimouse_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        amimouse_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-        amimouse_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        amimouse_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        amimouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        amimouse_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
         amimouse_dev->open = amimouse_open;
         amimouse_dev->close = amimouse_close;
 
diff --git a/drivers/input/mouse/atarimouse.c b/drivers/input/mouse/atarimouse.c
index c8c7244b48a1..98a3561d4b05 100644
--- a/drivers/input/mouse/atarimouse.c
+++ b/drivers/input/mouse/atarimouse.c
@@ -137,9 +137,10 @@ static int __init atamouse_init(void)
         atamouse_dev->id.product = 0x0002;
         atamouse_dev->id.version = 0x0100;
 
-        atamouse_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        atamouse_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-        atamouse_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        atamouse_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        atamouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        atamouse_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
         atamouse_dev->open = atamouse_open;
         atamouse_dev->close = atamouse_close;
 
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index 449bf4dcbbcc..27f88fbb7136 100644
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -298,12 +298,12 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
         idd = ptr->idd + 1;
         txt = "unknown";
         if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_REL) {
-                ptr->dev->evbit[0] = BIT(EV_REL);
+                ptr->dev->evbit[0] = BIT_MASK(EV_REL);
                 txt = "relative";
         }
 
         if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_ABS) {
-                ptr->dev->evbit[0] = BIT(EV_ABS);
+                ptr->dev->evbit[0] = BIT_MASK(EV_ABS);
                 txt = "absolute";
         }
         if (!ptr->dev->evbit[0])
@@ -311,7 +311,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
 
         ptr->nbtn = HIL_IDD_NUM_BUTTONS(idd);
         if (ptr->nbtn)
-                ptr->dev->evbit[0] |= BIT(EV_KEY);
+                ptr->dev->evbit[0] |= BIT_MASK(EV_KEY);
 
         naxsets = HIL_IDD_NUM_AXSETS(*idd);
         ptr->naxes = HIL_IDD_NUM_AXES_PER_SET(*idd);
diff --git a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c
index 79b624fe8994..655a39217432 100644
--- a/drivers/input/mouse/inport.c
+++ b/drivers/input/mouse/inport.c
@@ -163,9 +163,10 @@ static int __init inport_init(void)
         inport_dev->id.product = 0x0001;
         inport_dev->id.version = 0x0100;
 
-        inport_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        inport_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        inport_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        inport_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        inport_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        inport_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         inport_dev->open  = inport_open;
         inport_dev->close = inport_close;
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index d7de4c53b3d8..9ec57d80186e 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -270,9 +270,10 @@ static int lifebook_create_relative_device(struct psmouse *psmouse)
         dev2->id.version = 0x0000;
         dev2->dev.parent = &psmouse->ps2dev.serio->dev;
 
-        dev2->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        dev2->relbit[LONG(REL_X)] = BIT(REL_X) | BIT(REL_Y);
-        dev2->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
+        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);
 
         error = input_register_device(priv->dev2);
         if (error)
@@ -295,9 +296,9 @@ int lifebook_init(struct psmouse *psmouse)
         if (lifebook_absolute_mode(psmouse))
                 return -1;
 
-        dev1->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
+        dev1->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
         dev1->relbit[0] = 0;
-        dev1->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        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);
 
diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c
index 26c3b2e2ca94..b23a4f3ea5cd 100644
--- a/drivers/input/mouse/logibm.c
+++ b/drivers/input/mouse/logibm.c
@@ -156,9 +156,10 @@ static int __init logibm_init(void)
         logibm_dev->id.product = 0x0001;
         logibm_dev->id.version = 0x0100;
 
-        logibm_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        logibm_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        logibm_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        logibm_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        logibm_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        logibm_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         logibm_dev->open  = logibm_open;
         logibm_dev->close = logibm_close;
diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c
index 05d992e514f0..8991ab0b4fe3 100644
--- a/drivers/input/mouse/pc110pad.c
+++ b/drivers/input/mouse/pc110pad.c
@@ -144,9 +144,9 @@ static int __init pc110pad_init(void)
         pc110pad_dev->id.product = 0x0001;
         pc110pad_dev->id.version = 0x0100;
 
-        pc110pad_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        pc110pad_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
-        pc110pad_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        pc110pad_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        pc110pad_dev->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y);
+        pc110pad_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
         pc110pad_dev->absmax[ABS_X] = 0x1ff;
         pc110pad_dev->absmax[ABS_Y] = 0x0ff;
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 073525756532..da316d13d7f5 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1115,9 +1115,10 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse
 
         input_dev->dev.parent = &psmouse->ps2dev.serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         psmouse->set_rate = psmouse_set_rate;
         psmouse->set_resolution = psmouse_set_resolution;
diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c
index 355efd0423e7..18a48636ba4a 100644
--- a/drivers/input/mouse/rpcmouse.c
+++ b/drivers/input/mouse/rpcmouse.c
@@ -78,9 +78,10 @@ static int __init rpcmouse_init(void)
         rpcmouse_dev->id.product = 0x0001;
         rpcmouse_dev->id.version = 0x0100;
 
-        rpcmouse_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        rpcmouse_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        rpcmouse_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        rpcmouse_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        rpcmouse_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        rpcmouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         rpcmouse_lastx = (short) iomd_readl(IOMD_MOUSEX);
         rpcmouse_lasty = (short) iomd_readl(IOMD_MOUSEY);
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c
index 77b8ee2b9651..ed917bfd086a 100644
--- a/drivers/input/mouse/sermouse.c
+++ b/drivers/input/mouse/sermouse.c
@@ -268,9 +268,10 @@ static int sermouse_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
-        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT);
+        input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         if (c & 0x01) set_bit(BTN_MIDDLE, input_dev->keybit);
         if (c & 0x02) set_bit(BTN_SIDE, input_dev->keybit);
diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c
index 7b977fd23571..3fadb2accac0 100644
--- a/drivers/input/mouse/touchkit_ps2.c
+++ b/drivers/input/mouse/touchkit_ps2.c
@@ -85,7 +85,7 @@ int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
                 return -ENODEV;
 
         if (set_properties) {
-                dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
                 set_bit(BTN_TOUCH, dev->keybit);
                 input_set_abs_params(dev, ABS_X, 0, TOUCHKIT_MAX_XC, 0, 0);
                 input_set_abs_params(dev, ABS_Y, 0, TOUCHKIT_MAX_YC, 0, 0);