Revert "[media] rc: rc-ir-raw: Add scancode encoder callback" (72c5b7b2) · Commits · 戴 / test

drivers/media/rc/rc-core-priv.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ struct ir_raw_handler {

		u64 protocols; /* which are handled by this handler */
		int (decode)(struct rc_dev dev, struct ir_raw_event event);
		int (encode)(u64 protocols, const struct rc_scancode_filter scancode,
		struct ir_raw_event *events, unsigned int max);

		/* These two should only be used by the lirc decoder */
		int (raw_register)(struct rc_dev dev);

+0 −37

Original line number	Diff line number	Diff line
		@@ -246,43 +246,6 @@ static int change_protocol(struct rc_dev dev, u64 rc_type)
		return 0;
		}

		/**
		* ir_raw_encode_scancode() - Encode a scancode as raw events
		*
		* @protocols: permitted protocols
		* @scancode: scancode filter describing a single scancode
		* @events: array of raw events to write into
		* @max: max number of raw events
		*
		* Attempts to encode the scancode as raw events.
		*
		* Returns: The number of events written.
		* -ENOBUFS if there isn't enough space in the array to fit the
		* encoding. In this case all @max events will have been written.
		* -EINVAL if the scancode is ambiguous or invalid, or if no
		* compatible encoder was found.
		*/
		int ir_raw_encode_scancode(u64 protocols,
		const struct rc_scancode_filter *scancode,
		struct ir_raw_event *events, unsigned int max)
		{
		struct ir_raw_handler *handler;
		int ret = -EINVAL;

		mutex_lock(&ir_raw_handler_lock);
		list_for_each_entry(handler, &ir_raw_handler_list, list) {
		if (handler->protocols & protocols && handler->encode) {
		ret = handler->encode(protocols, scancode, events, max);
		if (ret >= 0 \|\| ret == -ENOBUFS)
		break;
		}
		}
		mutex_unlock(&ir_raw_handler_lock);

		return ret;
		}
		EXPORT_SYMBOL(ir_raw_encode_scancode);

		/*
		* Used to (un)register raw event clients
		*/

+0 −3

Original line number	Diff line number	Diff line
		@@ -250,9 +250,6 @@ int ir_raw_event_store_edge(struct rc_dev *dev, enum raw_event_type type);
		int ir_raw_event_store_with_filter(struct rc_dev *dev,
		struct ir_raw_event *ev);
		void ir_raw_event_set_idle(struct rc_dev *dev, bool idle);
		int ir_raw_encode_scancode(u64 protocols,
		const struct rc_scancode_filter *scancode,
		struct ir_raw_event *events, unsigned int max);

		static inline void ir_raw_event_reset(struct rc_dev *dev)
		{