mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
iio: core: move @clock_id from struct iio_dev to struct iio_dev_opaque
There is already an acessor function used to access it, making this move straight forward. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com> Link: https://lore.kernel.org/r/20210426174911.397061-10-jic23@kernel.org
This commit is contained in:
parent
8b1c82cb84
commit
62a486c46d
3 changed files with 16 additions and 12 deletions
|
@ -271,13 +271,25 @@ int iio_device_set_clock(struct iio_dev *indio_dev, clockid_t clock_id)
|
||||||
mutex_unlock(&indio_dev->mlock);
|
mutex_unlock(&indio_dev->mlock);
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
indio_dev->clock_id = clock_id;
|
iio_dev_opaque->clock_id = clock_id;
|
||||||
mutex_unlock(&indio_dev->mlock);
|
mutex_unlock(&indio_dev->mlock);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(iio_device_set_clock);
|
EXPORT_SYMBOL(iio_device_set_clock);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* iio_device_get_clock() - Retrieve current timestamping clock for the device
|
||||||
|
* @indio_dev: IIO device structure containing the device
|
||||||
|
*/
|
||||||
|
clockid_t iio_device_get_clock(const struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev);
|
||||||
|
|
||||||
|
return iio_dev_opaque->clock_id;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(iio_device_get_clock);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* iio_get_time_ns() - utility function to get a time stamp for events etc
|
* iio_get_time_ns() - utility function to get a time stamp for events etc
|
||||||
* @indio_dev: device
|
* @indio_dev: device
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
* @legacy_scan_el_group: attribute group for legacy scan elements attribute group
|
* @legacy_scan_el_group: attribute group for legacy scan elements attribute group
|
||||||
* @legacy_buffer_group: attribute group for legacy buffer attributes group
|
* @legacy_buffer_group: attribute group for legacy buffer attributes group
|
||||||
* @scan_index_timestamp: cache of the index to the timestamp
|
* @scan_index_timestamp: cache of the index to the timestamp
|
||||||
|
* @clock_id: timestamping clock posix identifier
|
||||||
* @chrdev: associated character device
|
* @chrdev: associated character device
|
||||||
* @flags: file ops related flags including busy flag.
|
* @flags: file ops related flags including busy flag.
|
||||||
* @debugfs_dentry: device specific debugfs dentry
|
* @debugfs_dentry: device specific debugfs dentry
|
||||||
|
@ -51,6 +52,7 @@ struct iio_dev_opaque {
|
||||||
struct attribute_group legacy_buffer_group;
|
struct attribute_group legacy_buffer_group;
|
||||||
|
|
||||||
unsigned int scan_index_timestamp;
|
unsigned int scan_index_timestamp;
|
||||||
|
clockid_t clock_id;
|
||||||
struct cdev chrdev;
|
struct cdev chrdev;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
|
|
@ -509,7 +509,6 @@ struct iio_buffer_setup_ops {
|
||||||
* @name: [DRIVER] name of the device.
|
* @name: [DRIVER] name of the device.
|
||||||
* @label: [DRIVER] unique name to identify which device this is
|
* @label: [DRIVER] unique name to identify which device this is
|
||||||
* @info: [DRIVER] callbacks and constant info from driver
|
* @info: [DRIVER] callbacks and constant info from driver
|
||||||
* @clock_id: [INTERN] timestamping clock posix identifier
|
|
||||||
* @setup_ops: [DRIVER] callbacks to call before and after buffer
|
* @setup_ops: [DRIVER] callbacks to call before and after buffer
|
||||||
* enable/disable
|
* enable/disable
|
||||||
* @priv: [DRIVER] reference to driver's private information
|
* @priv: [DRIVER] reference to driver's private information
|
||||||
|
@ -538,7 +537,6 @@ struct iio_dev {
|
||||||
const char *name;
|
const char *name;
|
||||||
const char *label;
|
const char *label;
|
||||||
const struct iio_info *info;
|
const struct iio_info *info;
|
||||||
clockid_t clock_id;
|
|
||||||
const struct iio_buffer_setup_ops *setup_ops;
|
const struct iio_buffer_setup_ops *setup_ops;
|
||||||
|
|
||||||
void *priv;
|
void *priv;
|
||||||
|
@ -589,15 +587,7 @@ static inline void iio_device_put(struct iio_dev *indio_dev)
|
||||||
put_device(&indio_dev->dev);
|
put_device(&indio_dev->dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
clockid_t iio_device_get_clock(const struct iio_dev *indio_dev);
|
||||||
* iio_device_get_clock() - Retrieve current timestamping clock for the device
|
|
||||||
* @indio_dev: IIO device structure containing the device
|
|
||||||
*/
|
|
||||||
static inline clockid_t iio_device_get_clock(const struct iio_dev *indio_dev)
|
|
||||||
{
|
|
||||||
return indio_dev->clock_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
int iio_device_set_clock(struct iio_dev *indio_dev, clockid_t clock_id);
|
int iio_device_set_clock(struct iio_dev *indio_dev, clockid_t clock_id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue