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>

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 0550ce075fc4..1d9defb1a10c 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/drivers/misc/ibmasm/remote.c
@@ -226,9 +226,9 @@ int ibmasm_init_remote_input_dev(struct service_processor *sp)
         mouse_dev->id.product = pdev->device;
         mouse_dev->id.version = 1;
         mouse_dev->dev.parent = sp->dev;
-        mouse_dev->evbit[0]  = BIT(EV_KEY) | BIT(EV_ABS);
-        mouse_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) |
-                BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
+        mouse_dev->evbit[0]  = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        mouse_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
         set_bit(BTN_TOUCH, mouse_dev->keybit);
         mouse_dev->name = "ibmasm RSA I remote mouse";
         input_set_abs_params(mouse_dev, ABS_X, 0, MOUSE_X_MAX, 0, 0);
@@ -239,7 +239,7 @@ int ibmasm_init_remote_input_dev(struct service_processor *sp)
         keybd_dev->id.product = pdev->device;
         keybd_dev->id.version = 2;
         keybd_dev->dev.parent = sp->dev;
-        keybd_dev->evbit[0]  = BIT(EV_KEY);
+        keybd_dev->evbit[0]  = BIT_MASK(EV_KEY);
         keybd_dev->name = "ibmasm RSA I remote keyboard";
 
         for (i = 0; i < XLATE_SIZE; i++) {
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index e73a71f04bb4..86da96becd28 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -411,9 +411,9 @@ static int sony_laptop_setup_input(void)
         jog_dev->id.bustype = BUS_ISA;
         jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
 
-        jog_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        jog_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_MIDDLE);
-        jog_dev->relbit[0] = BIT(REL_WHEEL);
+        jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
+        jog_dev->relbit[0] = BIT_MASK(REL_WHEEL);
 
         error = input_register_device(jog_dev);
         if (error)