5 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 5a12b5679556..154a7ce7cb82 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -820,7 +820,7 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
 
         input_dev->name = DRIVER_NAME " remote control";
         input_dev->phys = cinergyt2->phys;
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         for (i = 0; i < ARRAY_SIZE(rc_keys); i += 3)
                 set_bit(rc_keys[i + 2], input_dev->keybit);
         input_dev->keycodesize = 0;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 7b9f35bfb4f0..c0c2c22ddd83 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -106,7 +106,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
         if (!input_dev)
                 return -ENOMEM;
 
-        input_dev->evbit[0] = BIT(EV_KEY);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
         input_dev->name = "IR-receiver inside an USB DVB receiver";
         input_dev->phys = d->rc_phys;
         usb_to_input_id(d->udev, &input_dev->id);
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 5e691fd79904..1ec981d98b91 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1198,7 +1198,7 @@ static int ttusb_init_rc( struct ttusb_dec *dec)
 
         input_dev->name = "ttusb_dec remote control";
         input_dev->phys = dec->rc_phys;
-        input_dev->evbit[0] = BIT(EV_KEY);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
         input_dev->keycodesize = sizeof(u16);
         input_dev->keycodemax = 0x1a;
         input_dev->keycode = rc_keys;
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index 491505d6fdee..3e93f8058770 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -238,8 +238,8 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
         usb_to_input_id(dev, &input_dev->id);
         input_dev->dev.parent = &dev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY);
-        input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
 
         input_dev->private = cam;
 
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index dd1a6d6bbc9e..d847273eeba0 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -102,8 +102,8 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)
         usb_to_input_id(dev, &input_dev->id);
         input_dev->dev.parent = &dev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY);
-        input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
 
         input_dev->private = cam;