Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 81c2a3ba497835797332b517ebf2de7b7f2a7c80

Authored by Daniel Mack
Committed by Dmitry Torokhov
1 parent a62f0d27b4
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Input: use ABS_CNT rather than (ABS_MAX + 1) 

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Showing 6 changed files with 21 additions and 21 deletions Side-by-side Diff

drivers/hid/hid-debug.c
Diff comments   View file @ 81c2a3b
... ... @@ -811,7 +811,7 @@
811 811 [REL_WHEEL] = "Wheel", [REL_MISC] = "Misc",
812 812 };
813 813  
814   -static const char *absolutes[ABS_MAX + 1] = {
  814 +static const char *absolutes[ABS_CNT] = {
815 815 [ABS_X] = "X", [ABS_Y] = "Y",
816 816 [ABS_Z] = "Z", [ABS_RX] = "Rx",
817 817 [ABS_RY] = "Ry", [ABS_RZ] = "Rz",
drivers/input/joydev.c
Diff comments   View file @ 81c2a3b
... ... @@ -47,15 +47,15 @@
47 47 struct mutex mutex;
48 48 struct device dev;
49 49  
50   - struct js_corr corr[ABS_MAX + 1];
  50 + struct js_corr corr[ABS_CNT];
51 51 struct JS_DATA_SAVE_TYPE glue;
52 52 int nabs;
53 53 int nkey;
54 54 __u16 keymap[KEY_MAX - BTN_MISC + 1];
55 55 __u16 keypam[KEY_MAX - BTN_MISC + 1];
56   - __u8 absmap[ABS_MAX + 1];
57   - __u8 abspam[ABS_MAX + 1];
58   - __s16 abs[ABS_MAX + 1];
  56 + __u8 absmap[ABS_CNT];
  57 + __u8 abspam[ABS_CNT];
  58 + __s16 abs[ABS_CNT];
59 59 };
60 60  
61 61 struct joydev_client {
... ... @@ -826,7 +826,7 @@
826 826 joydev->handle.handler = handler;
827 827 joydev->handle.private = joydev;
828 828  
829   - for (i = 0; i < ABS_MAX + 1; i++)
  829 + for (i = 0; i < ABS_CNT; i++)
830 830 if (test_bit(i, dev->absbit)) {
831 831 joydev->absmap[i] = joydev->nabs;
832 832 joydev->abspam[joydev->nabs] = i;
drivers/input/misc/uinput.c
Diff comments   View file @ 81c2a3b
... ... @@ -300,7 +300,7 @@
300 300 unsigned int cnt;
301 301 int retval = 0;
302 302  
303   - for (cnt = 0; cnt < ABS_MAX + 1; cnt++) {
  303 + for (cnt = 0; cnt < ABS_CNT; cnt++) {
304 304 if (!test_bit(cnt, dev->absbit))
305 305 continue;
306 306  
... ... @@ -387,7 +387,7 @@
387 387 dev->id.product = user_dev->id.product;
388 388 dev->id.version = user_dev->id.version;
389 389  
390   - size = sizeof(int) * (ABS_MAX + 1);
  390 + size = sizeof(int) * ABS_CNT;
391 391 memcpy(dev->absmax, user_dev->absmax, size);
392 392 memcpy(dev->absmin, user_dev->absmin, size);
393 393 memcpy(dev->absfuzz, user_dev->absfuzz, size);
include/linux/input.h
Diff comments   View file @ 81c2a3b
... ... @@ -1155,7 +1155,7 @@
1155 1155  
1156 1156 int sync;
1157 1157  
1158   - int abs[ABS_MAX + 1];
  1158 + int abs[ABS_CNT];
1159 1159 int rep[REP_MAX + 1];
1160 1160  
1161 1161 unsigned long key[BITS_TO_LONGS(KEY_CNT)];
... ... @@ -1163,11 +1163,11 @@
1163 1163 unsigned long snd[BITS_TO_LONGS(SND_CNT)];
1164 1164 unsigned long sw[BITS_TO_LONGS(SW_CNT)];
1165 1165  
1166   - int absmax[ABS_MAX + 1];
1167   - int absmin[ABS_MAX + 1];
1168   - int absfuzz[ABS_MAX + 1];
1169   - int absflat[ABS_MAX + 1];
1170   - int absres[ABS_MAX + 1];
  1166 + int absmax[ABS_CNT];
  1167 + int absmin[ABS_CNT];
  1168 + int absfuzz[ABS_CNT];
  1169 + int absflat[ABS_CNT];
  1170 + int absres[ABS_CNT];
1171 1171  
1172 1172 int (*open)(struct input_dev *dev);
1173 1173 void (*close)(struct input_dev *dev);
include/linux/joystick.h
Diff comments   View file @ 81c2a3b
... ... @@ -64,8 +64,8 @@
64 64 #define JSIOCSCORR _IOW('j', 0x21, struct js_corr) /* set correction values */
65 65 #define JSIOCGCORR _IOR('j', 0x22, struct js_corr) /* get correction values */
66 66  
67   -#define JSIOCSAXMAP _IOW('j', 0x31, __u8[ABS_MAX + 1]) /* set axis mapping */
68   -#define JSIOCGAXMAP _IOR('j', 0x32, __u8[ABS_MAX + 1]) /* get axis mapping */
  67 +#define JSIOCSAXMAP _IOW('j', 0x31, __u8[ABS_CNT]) /* set axis mapping */
  68 +#define JSIOCGAXMAP _IOR('j', 0x32, __u8[ABS_CNT]) /* get axis mapping */
69 69 #define JSIOCSBTNMAP _IOW('j', 0x33, __u16[KEY_MAX - BTN_MISC + 1]) /* set button mapping */
70 70 #define JSIOCGBTNMAP _IOR('j', 0x34, __u16[KEY_MAX - BTN_MISC + 1]) /* get button mapping */
71 71  
include/linux/uinput.h
Diff comments   View file @ 81c2a3b
... ... @@ -166,11 +166,11 @@
166 166 struct uinput_user_dev {
167 167 char name[UINPUT_MAX_NAME_SIZE];
168 168 struct input_id id;
169   - int ff_effects_max;
170   - int absmax[ABS_MAX + 1];
171   - int absmin[ABS_MAX + 1];
172   - int absfuzz[ABS_MAX + 1];
173   - int absflat[ABS_MAX + 1];
  169 + int ff_effects_max;
  170 + int absmax[ABS_CNT];
  171 + int absmin[ABS_CNT];
  172 + int absfuzz[ABS_CNT];
  173 + int absflat[ABS_CNT];
174 174 };
175 175 #endif /* __UINPUT_H_ */