3 files changed, 26 insertions, 25 deletions

diff --git a/include/linux/hid.h b/include/linux/hid.h
index edb8024d744b..6e35b92b1d2c 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -469,8 +469,8 @@ struct hid_device {							/* device report descriptor */
         /* handler for raw output data, used by hidraw */
         int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t);
 #ifdef CONFIG_USB_HIDINPUT_POWERBOOK
-        unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
-        unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
+        unsigned long pb_pressed_fn[BITS_TO_LONGS(KEY_CNT)];
+        unsigned long pb_pressed_numlock[BITS_TO_LONGS(KEY_CNT)];
 #endif
 };
 
diff --git a/include/linux/input.h b/include/linux/input.h
index 219d220d185b..62268929856c 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -98,6 +98,7 @@ struct input_absinfo {
 #define EV_PWR                  0x16
 #define EV_FF_STATUS            0x17
 #define EV_MAX                  0x1f
+#define EV_CNT                  (EV_MAX+1)
 
 /*
  * Synchronization events.
@@ -567,6 +568,7 @@ struct input_absinfo {
 /* We avoid low common keys in module aliases so they don't get huge. */
 #define KEY_MIN_INTERESTING     KEY_MUTE
 #define KEY_MAX                 0x1ff
+#define KEY_CNT                 (KEY_MAX+1)
 
 /*
  * Relative axes
@@ -583,6 +585,7 @@ struct input_absinfo {
 #define REL_WHEEL               0x08
 #define REL_MISC                0x09
 #define REL_MAX                 0x0f
+#define REL_CNT                 (REL_MAX+1)
 
 /*
  * Absolute axes
@@ -615,6 +618,7 @@ struct input_absinfo {
 #define ABS_VOLUME              0x20
 #define ABS_MISC                0x28
 #define ABS_MAX                 0x3f
+#define ABS_CNT                 (ABS_MAX+1)
 
 /*
  * Switch events
@@ -625,6 +629,7 @@ struct input_absinfo {
 #define SW_HEADPHONE_INSERT     0x02  /* set = inserted */
 #define SW_RADIO                0x03  /* set = radio enabled */
 #define SW_MAX                  0x0f
+#define SW_CNT                  (SW_MAX+1)
 
 /*
  * Misc events
@@ -636,6 +641,7 @@ struct input_absinfo {
 #define MSC_RAW                 0x03
 #define MSC_SCAN                0x04
 #define MSC_MAX                 0x07
+#define MSC_CNT                 (MSC_MAX+1)
 
 /*
  * LEDs
@@ -653,6 +659,7 @@ struct input_absinfo {
 #define LED_MAIL                0x09
 #define LED_CHARGING            0x0a
 #define LED_MAX                 0x0f
+#define LED_CNT                 (LED_MAX+1)
 
 /*
  * Autorepeat values
@@ -670,6 +677,7 @@ struct input_absinfo {
 #define SND_BELL                0x01
 #define SND_TONE                0x02
 #define SND_MAX                 0x07
+#define SND_CNT                 (SND_MAX+1)
 
 /*
  * IDs.
@@ -920,6 +928,7 @@ struct ff_effect {
 #define FF_AUTOCENTER   0x61
 
 #define FF_MAX          0x7f
+#define FF_CNT          (FF_MAX+1)
 
 #ifdef __KERNEL__
 
@@ -932,10 +941,6 @@ struct ff_effect {
 #include <linux/timer.h>
 #include <linux/mod_devicetable.h>
 
-#define NBITS(x) (((x)/BITS_PER_LONG)+1)
-#define BIT(x)  (1UL<<((x)%BITS_PER_LONG))
-#define LONG(x) ((x)/BITS_PER_LONG)
-
 /**
  * struct input_dev - represents an input device
  * @name: name of the device
@@ -1020,15 +1025,15 @@ struct input_dev {
         const char *uniq;
         struct input_id id;
 
-        unsigned long evbit[NBITS(EV_MAX)];
-        unsigned long keybit[NBITS(KEY_MAX)];
-        unsigned long relbit[NBITS(REL_MAX)];
-        unsigned long absbit[NBITS(ABS_MAX)];
-        unsigned long mscbit[NBITS(MSC_MAX)];
-        unsigned long ledbit[NBITS(LED_MAX)];
-        unsigned long sndbit[NBITS(SND_MAX)];
-        unsigned long ffbit[NBITS(FF_MAX)];
-        unsigned long swbit[NBITS(SW_MAX)];
+        unsigned long evbit[BITS_TO_LONGS(EV_CNT)];
+        unsigned long keybit[BITS_TO_LONGS(KEY_CNT)];
+        unsigned long relbit[BITS_TO_LONGS(REL_CNT)];
+        unsigned long absbit[BITS_TO_LONGS(ABS_CNT)];
+        unsigned long mscbit[BITS_TO_LONGS(MSC_CNT)];
+        unsigned long ledbit[BITS_TO_LONGS(LED_CNT)];
+        unsigned long sndbit[BITS_TO_LONGS(SND_CNT)];
+        unsigned long ffbit[BITS_TO_LONGS(FF_CNT)];
+        unsigned long swbit[BITS_TO_LONGS(SW_CNT)];
 
         unsigned int keycodemax;
         unsigned int keycodesize;
@@ -1046,10 +1051,10 @@ struct input_dev {
         int abs[ABS_MAX + 1];
         int rep[REP_MAX + 1];
 
-        unsigned long key[NBITS(KEY_MAX)];
-        unsigned long led[NBITS(LED_MAX)];
-        unsigned long snd[NBITS(SND_MAX)];
-        unsigned long sw[NBITS(SW_MAX)];
+        unsigned long key[BITS_TO_LONGS(KEY_CNT)];
+        unsigned long led[BITS_TO_LONGS(LED_CNT)];
+        unsigned long snd[BITS_TO_LONGS(SND_CNT)];
+        unsigned long sw[BITS_TO_LONGS(SW_CNT)];
 
         int absmax[ABS_MAX + 1];
         int absmin[ABS_MAX + 1];
@@ -1293,7 +1298,7 @@ static inline void input_set_abs_params(struct input_dev *dev, int axis, int min
         dev->absfuzz[axis] = fuzz;
         dev->absflat[axis] = flat;
 
-        dev->absbit[LONG(axis)] |= BIT(axis);
+        dev->absbit[BIT_WORD(axis)] |= BIT_MASK(axis);
 }
 
 extern struct class input_class;
@@ -1334,7 +1339,7 @@ struct ff_device {
 
         void *private;
 
-        unsigned long ffbit[NBITS(FF_MAX)];
+        unsigned long ffbit[BITS_TO_LONGS(FF_CNT)];
 
         struct mutex mutex;
 
diff --git a/include/linux/uinput.h b/include/linux/uinput.h
index a6c1e8eed226..15ddd4483b09 100644
--- a/include/linux/uinput.h
+++ b/include/linux/uinput.h
@@ -162,10 +162,6 @@ struct uinput_ff_erase {
 #define UI_FF_UPLOAD            1
 #define UI_FF_ERASE             2
 
-#ifndef NBITS
-#define NBITS(x) ((((x)-1)/(sizeof(long)*8))+1)
-#endif  /* NBITS */
-
 #define UINPUT_MAX_NAME_SIZE    80
 struct uinput_user_dev {
         char name[UINPUT_MAX_NAME_SIZE];