Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5034bfc9 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

iio:trigger: Use dev_{set,get}_drvdata for private data management 



Use dev_{set,get}_drvdata for managing private data attached to a trigger
instead of using a custom field in the iio_trigger struct.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 1e9663c6

drivers/staging/iio/Documentation/trigger.txt

+0 −3
Original line number Original line Diff line number Diff line
@@ -10,9 +10,6 @@ struct iio_trig *trig = iio_trigger_alloc("<trigger format string>", ...); 
allocates a trigger structure.  The key elements to then fill in within

allocates a trigger structure.  The key elements to then fill in within

a driver are:

a driver are:





trig->private_data

	Device specific private data.



trig->owner

trig->owner

	Typically set to THIS_MODULE. Used to ensure correct

	Typically set to THIS_MODULE. Used to ensure correct

	ownership of core allocated resources.

	ownership of core allocated resources.

include/linux/iio/trigger.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ struct iio_trigger_ops { 
 * @id:			[INTERN] unique id number

 * @id:			[INTERN] unique id number

 * @name:		[DRIVER] unique name

 * @name:		[DRIVER] unique name

 * @dev:		[DRIVER] associated device (if relevant)

 * @dev:		[DRIVER] associated device (if relevant)

 * @private_data:	[DRIVER] device specific data

 * @list:		[INTERN] used in maintenance of global trigger list

 * @list:		[INTERN] used in maintenance of global trigger list

 * @alloc_list:		[DRIVER] used for driver specific trigger list

 * @alloc_list:		[DRIVER] used for driver specific trigger list

 * @use_count:		use count for the trigger

 * @use_count:		use count for the trigger
@@ -60,7 +59,6 @@ struct iio_trigger { 
	const char			*name;

	const char			*name;

	struct device			dev;

	struct device			dev;





	void				*private_data;

	struct list_head		list;

	struct list_head		list;

	struct list_head		alloc_list;

	struct list_head		alloc_list;

	int use_count;

	int use_count;
@@ -101,7 +99,7 @@ static inline void iio_trigger_get(struct iio_trigger *trig) 
 */

 */

static inline void iio_trigger_set_drvdata(struct iio_trigger *trig, void *data)

static inline void iio_trigger_set_drvdata(struct iio_trigger *trig, void *data)

{

{

	trig->private_data = data;

	dev_set_drvdata(&trig->dev, data);

}

}





/**

/**
@@ -112,7 +110,7 @@ static inline void iio_trigger_set_drvdata(struct iio_trigger *trig, void *data) 
 */

 */

static inline void *iio_trigger_get_drvdata(struct iio_trigger *trig)

static inline void *iio_trigger_get_drvdata(struct iio_trigger *trig)

{

{

	return trig->private_data;

	return dev_get_drvdata(&trig->dev);

}

}





/**

/**