staging:iio:trigger push functions that don't need to be generaly available down into the core. (208b813c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/staging/iio/industrialio-trigger.c

+24 −6

Original line number	Diff line number	Diff line
		@@ -215,6 +215,26 @@ void iio_trigger_notify_done(struct iio_trigger *trig)
		EXPORT_SYMBOL(iio_trigger_notify_done);

		/* Trigger Consumer related functions */
		static int iio_trigger_get_irq(struct iio_trigger *trig)
		{
		int ret;
		mutex_lock(&trig->pool_lock);
		ret = bitmap_find_free_region(trig->pool,
		CONFIG_IIO_CONSUMERS_PER_TRIGGER,
		ilog2(1));
		mutex_unlock(&trig->pool_lock);
		if (ret >= 0)
		ret += trig->subirq_base;

		return ret;
		}

		static void iio_trigger_put_irq(struct iio_trigger *trig, int irq)
		{
		mutex_lock(&trig->pool_lock);
		clear_bit(irq - trig->subirq_base, trig->pool);
		mutex_unlock(&trig->pool_lock);
		}

		/* Complexity in here. With certain triggers (datardy) an acknowledgement
		* may be needed if the pollfuncs do not include the data read for the
		@@ -223,7 +243,7 @@ EXPORT_SYMBOL(iio_trigger_notify_done);
		* the relevant function is in there may be the best option.
		*/
		/* Worth protecting against double additions?*/
		int iio_trigger_attach_poll_func(struct iio_trigger *trig,
		static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
		struct iio_poll_func *pf)
		{
		int ret = 0;
		@@ -241,9 +261,8 @@ int iio_trigger_attach_poll_func(struct iio_trigger *trig,

		return ret;
		}
		EXPORT_SYMBOL(iio_trigger_attach_poll_func);

		int iio_trigger_dettach_poll_func(struct iio_trigger *trig,
		static int iio_trigger_dettach_poll_func(struct iio_trigger *trig,
		struct iio_poll_func *pf)
		{
		int ret = 0;
		@@ -263,7 +282,6 @@ int iio_trigger_dettach_poll_func(struct iio_trigger *trig,
		error_ret:
		return ret;
		}
		EXPORT_SYMBOL(iio_trigger_dettach_poll_func);

		irqreturn_t iio_pollfunc_store_time(int irq, void *p)
		{

drivers/staging/iio/trigger.h

+0 −39

Original line number	Diff line number	Diff line
		@@ -103,23 +103,6 @@ int iio_trigger_register(struct iio_trigger *trig_info);
		**/
		void iio_trigger_unregister(struct iio_trigger *trig_info);

		/**
		* iio_trigger_attach_poll_func() - add a function pair to be run on trigger
		* @trig: trigger to which the function pair are being added
		* @pf: poll function pair
		**/
		int iio_trigger_attach_poll_func(struct iio_trigger *trig,
		struct iio_poll_func *pf);

		/**
		* iio_trigger_dettach_poll_func() - remove function pair from those to be
		* run on trigger
		* @trig: trigger from which the function is being removed
		* @pf: poll function pair
		**/
		int iio_trigger_dettach_poll_func(struct iio_trigger *trig,
		struct iio_poll_func *pf);

		/**
		* iio_trigger_poll() - called on a trigger occurring
		* @trig: trigger which occurred
		@@ -129,30 +112,8 @@ int iio_trigger_dettach_poll_func(struct iio_trigger *trig,
		void iio_trigger_poll(struct iio_trigger *trig, s64 time);
		void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time);


		irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private);

		static inline int iio_trigger_get_irq(struct iio_trigger *trig)
		{
		int ret;
		mutex_lock(&trig->pool_lock);
		ret = bitmap_find_free_region(trig->pool,
		CONFIG_IIO_CONSUMERS_PER_TRIGGER,
		ilog2(1));
		mutex_unlock(&trig->pool_lock);
		if (ret >= 0)
		ret += trig->subirq_base;

		return ret;
		};

		static inline void iio_trigger_put_irq(struct iio_trigger *trig, int irq)
		{
		mutex_lock(&trig->pool_lock);
		clear_bit(irq - trig->subirq_base, trig->pool);
		mutex_unlock(&trig->pool_lock);
		};

		struct iio_trigger iio_allocate_trigger(const char fmt, ...)
		__attribute__((format(printf, 1, 2)));
		void iio_free_trigger(struct iio_trigger *trig);