Merge "Input: use for_each_set_bit() where appropriate" (5e1209ff) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/input/input.c

+9 −21

Original line number	Diff line number	Diff line
		@@ -671,12 +671,9 @@ static void input_dev_release_keys(struct input_dev *dev)
		int code;

		if (is_event_supported(EV_KEY, dev->evbit, EV_MAX)) {
		for (code = 0; code <= KEY_MAX; code++) {
		if (is_event_supported(code, dev->keybit, KEY_MAX) &&
		__test_and_clear_bit(code, dev->key)) {
		for_each_set_bit(code, dev->key, KEY_CNT)
		input_pass_event(dev, EV_KEY, code, 0);
		}
		}
		memset(dev->key, 0, sizeof(dev->key));
		input_pass_event(dev, EV_SYN, SYN_REPORT, 1);
		}
		}
		@@ -1620,10 +1617,7 @@ static int input_dev_uevent(struct device device, struct kobj_uevent_env env)
		if (!test_bit(EV_##type, dev->evbit)) \
		break; \
		\
		for (i = 0; i < type##_MAX; i++) { \
		if (!test_bit(i, dev->bits##bit)) \
		continue; \
		\
		for_each_set_bit(i, dev->bits##bit, type##_CNT) { \
		active = test_bit(i, dev->bits); \
		if (!active && !on) \
		continue; \
		@@ -1980,18 +1974,12 @@ static unsigned int input_estimate_events_per_packet(struct input_dev *dev)

		events = mt_slots + 1; /* count SYN_MT_REPORT and SYN_REPORT */

		for (i = 0; i < ABS_CNT; i++) {
		if (test_bit(i, dev->absbit)) {
		if (input_is_mt_axis(i))
		events += mt_slots;
		else
		events++;
		}
		}
		if (test_bit(EV_ABS, dev->evbit))
		for_each_set_bit(i, dev->absbit, ABS_CNT)
		events += input_is_mt_axis(i) ? mt_slots : 1;

		for (i = 0; i < REL_CNT; i++)
		if (test_bit(i, dev->relbit))
		events++;
		if (test_bit(EV_REL, dev->evbit))
		events += bitmap_weight(dev->relbit, REL_CNT);

		/* Make room for KEY and MSC events */
		events += 7;