Commit 067fda1c authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Jonathan Cameron
Browse files

iio: hid-sensors: move triggered buffer setup into hid_sensor_setup_trigger 



The main intent here is to get rid of the iio_buffer_set_attrs() helper, or
at least rework it's usage a bit.
The problem with that helper is that it needs a pointer to the buffer,
which makes supporting multiple buffers per IIO device a bit more
cumbersome.

The hid_sensor_setup_trigger() is pretty much used in the same way:
- iio_triggered_buffer_setup() gets called before
- then hid_sensor_setup_trigger() and hid_sensor_setup_batch_mode() gets
  called which may attach some fifo attributes

This change merges the 2 together under the hid_sensor_setup_trigger()
function. Only the &iio_pollfunc_store_time is passed to all devices, so
it's not even required to pass it explicitly outside of the common
hid_sensor_setup_trigger() function.

Moving the devm_iio_triggered_buffer_setup/cleanup() calls into the common
place code can help the rework of the buffer code, since it is in one
place.

One detail of the change is that there are 2 drivers that use
devm_iio_triggered_buffer_setup(). That function gets implicitly
replaced with iio_triggered_buffer_setup()/cleanup(), but since all drivers
call both hid_sensor_setup_trigger9) & hid_sensor_remove_trigger() trigger,
the iio_triggered_buffer_cleanup() piggy backs on the
hid_sensor_remove_trigger() call, which should cover the cleanup.

Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 8fe78d52

drivers/iio/accel/hid-sensor-accel-3d.c

+4 −14
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <linux/iio/iio.h>

#include <linux/iio/sysfs.h>

#include <linux/iio/buffer.h>

#include <linux/iio/trigger_consumer.h>

#include <linux/iio/triggered_buffer.h>

#include "../common/hid-sensors/hid-sensor-trigger.h"



enum accel_3d_channel {
@@ -391,18 +389,13 @@ static int hid_accel_3d_probe(struct platform_device *pdev) 
	indio_dev->name = name;

	indio_dev->modes = INDIO_DIRECT_MODE;



	ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,

		NULL, NULL);

	if (ret) {

		dev_err(&pdev->dev, "failed to initialize trigger buffer\n");

		goto error_free_dev_mem;

	}

	atomic_set(&accel_state->common_attributes.data_ready, 0);



	ret = hid_sensor_setup_trigger(indio_dev, name,

					&accel_state->common_attributes);

	if (ret < 0) {

		dev_err(&pdev->dev, "trigger setup failed\n");

		goto error_unreg_buffer_funcs;

		goto error_free_dev_mem;

	}



	ret = iio_device_register(indio_dev);
@@ -426,9 +419,7 @@ static int hid_accel_3d_probe(struct platform_device *pdev) 
error_iio_unreg:

	iio_device_unregister(indio_dev);

error_remove_trigger:

	hid_sensor_remove_trigger(&accel_state->common_attributes);

error_unreg_buffer_funcs:

	iio_triggered_buffer_cleanup(indio_dev);

	hid_sensor_remove_trigger(indio_dev, &accel_state->common_attributes);

error_free_dev_mem:

	kfree(indio_dev->channels);

	return ret;
@@ -443,8 +434,7 @@ static int hid_accel_3d_remove(struct platform_device *pdev) 


	sensor_hub_remove_callback(hsdev, hsdev->usage);

	iio_device_unregister(indio_dev);

	hid_sensor_remove_trigger(&accel_state->common_attributes);

	iio_triggered_buffer_cleanup(indio_dev);

	hid_sensor_remove_trigger(indio_dev, &accel_state->common_attributes);

	kfree(indio_dev->channels);



	return 0;

drivers/iio/common/hid-sensors/hid-sensor-trigger.c

+15 −3
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/hid-sensor-hub.h>

#include <linux/iio/iio.h>

#include <linux/iio/trigger.h>

#include <linux/iio/triggered_buffer.h>

#include <linux/iio/trigger_consumer.h>

#include <linux/iio/buffer.h>

#include <linux/iio/sysfs.h>

#include "hid-sensor-trigger.h"
@@ -222,7 +224,8 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig, 
	return hid_sensor_power_state(iio_trigger_get_drvdata(trig), state);

}



void hid_sensor_remove_trigger(struct hid_sensor_common *attrb)

void hid_sensor_remove_trigger(struct iio_dev *indio_dev,

			       struct hid_sensor_common *attrb)

{

	if (atomic_read(&attrb->runtime_pm_enable))

		pm_runtime_disable(&attrb->pdev->dev);
@@ -233,6 +236,7 @@ void hid_sensor_remove_trigger(struct hid_sensor_common *attrb) 
	cancel_work_sync(&attrb->work);

	iio_trigger_unregister(attrb->trigger);

	iio_trigger_free(attrb->trigger);

	iio_triggered_buffer_cleanup(indio_dev);

}

EXPORT_SYMBOL(hid_sensor_remove_trigger);
@@ -246,11 +250,18 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name, 
	int ret;

	struct iio_trigger *trig;



	ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,

					 NULL, NULL);

	if (ret) {

		dev_err(&indio_dev->dev, "Triggered Buffer Setup Failed\n");

		return ret;

	}



	trig = iio_trigger_alloc("%s-dev%d", name, indio_dev->id);

	if (trig == NULL) {

		dev_err(&indio_dev->dev, "Trigger Allocate Failed\n");

		ret = -ENOMEM;

		goto error_ret;

		goto error_triggered_buffer_cleanup;

	}



	trig->dev.parent = indio_dev->dev.parent;
@@ -284,7 +295,8 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name, 
	iio_trigger_unregister(trig);

error_free_trig:

	iio_trigger_free(trig);

error_ret:

error_triggered_buffer_cleanup:

	iio_triggered_buffer_cleanup(indio_dev);

	return ret;

}

EXPORT_SYMBOL(hid_sensor_setup_trigger);

drivers/iio/common/hid-sensors/hid-sensor-trigger.h

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ extern const struct dev_pm_ops hid_sensor_pm_ops; 


int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,

				struct hid_sensor_common *attrb);

void hid_sensor_remove_trigger(struct hid_sensor_common *attrb);

void hid_sensor_remove_trigger(struct iio_dev *indio_dev,

			       struct hid_sensor_common *attrb);

int hid_sensor_power_state(struct hid_sensor_common *st, bool state);



#endif

drivers/iio/gyro/hid-sensor-gyro-3d.c

+4 −14
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <linux/iio/iio.h>

#include <linux/iio/sysfs.h>

#include <linux/iio/buffer.h>

#include <linux/iio/trigger_consumer.h>

#include <linux/iio/triggered_buffer.h>

#include "../common/hid-sensors/hid-sensor-trigger.h"



enum gyro_3d_channel {
@@ -326,18 +324,13 @@ static int hid_gyro_3d_probe(struct platform_device *pdev) 
	indio_dev->name = name;

	indio_dev->modes = INDIO_DIRECT_MODE;



	ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,

		NULL, NULL);

	if (ret) {

		dev_err(&pdev->dev, "failed to initialize trigger buffer\n");

		goto error_free_dev_mem;

	}

	atomic_set(&gyro_state->common_attributes.data_ready, 0);



	ret = hid_sensor_setup_trigger(indio_dev, name,

					&gyro_state->common_attributes);

	if (ret < 0) {

		dev_err(&pdev->dev, "trigger setup failed\n");

		goto error_unreg_buffer_funcs;

		goto error_free_dev_mem;

	}



	ret = iio_device_register(indio_dev);
@@ -361,9 +354,7 @@ static int hid_gyro_3d_probe(struct platform_device *pdev) 
error_iio_unreg:

	iio_device_unregister(indio_dev);

error_remove_trigger:

	hid_sensor_remove_trigger(&gyro_state->common_attributes);

error_unreg_buffer_funcs:

	iio_triggered_buffer_cleanup(indio_dev);

	hid_sensor_remove_trigger(indio_dev, &gyro_state->common_attributes);

error_free_dev_mem:

	kfree(indio_dev->channels);

	return ret;
@@ -378,8 +369,7 @@ static int hid_gyro_3d_remove(struct platform_device *pdev) 


	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_GYRO_3D);

	iio_device_unregister(indio_dev);

	hid_sensor_remove_trigger(&gyro_state->common_attributes);

	iio_triggered_buffer_cleanup(indio_dev);

	hid_sensor_remove_trigger(indio_dev, &gyro_state->common_attributes);

	kfree(indio_dev->channels);



	return 0;

drivers/iio/humidity/hid-sensor-humidity.c

+3 −9
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#include <linux/hid-sensor-hub.h>

#include <linux/iio/buffer.h>

#include <linux/iio/iio.h>

#include <linux/iio/triggered_buffer.h>

#include <linux/iio/trigger_consumer.h>

#include <linux/module.h>

#include <linux/platform_device.h>
@@ -233,12 +231,8 @@ static int hid_humidity_probe(struct platform_device *pdev) 
	indio_dev->name = name;

	indio_dev->modes = INDIO_DIRECT_MODE;



	ret = devm_iio_triggered_buffer_setup(&pdev->dev, indio_dev,

					&iio_pollfunc_store_time, NULL, NULL);

	if (ret)

		return ret;



	atomic_set(&humid_st->common_attributes.data_ready, 0);



	ret = hid_sensor_setup_trigger(indio_dev, name,

				&humid_st->common_attributes);

	if (ret)
@@ -261,7 +255,7 @@ static int hid_humidity_probe(struct platform_device *pdev) 
error_remove_callback:

	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_HUMIDITY);

error_remove_trigger:

	hid_sensor_remove_trigger(&humid_st->common_attributes);

	hid_sensor_remove_trigger(indio_dev, &humid_st->common_attributes);

	return ret;

}
@@ -274,7 +268,7 @@ static int hid_humidity_remove(struct platform_device *pdev) 


	iio_device_unregister(indio_dev);

	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_HUMIDITY);

	hid_sensor_remove_trigger(&humid_st->common_attributes);

	hid_sensor_remove_trigger(indio_dev, &humid_st->common_attributes);



	return 0;

}