Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-06 05:13:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hid: iio: rename struct hid_sensor_iio_common to hid_sensor_common

Browse Source 
The structure with common attributes for hid-sensors isn't specific
to the iio-subsystem, so rename it to hid_sensor_common.

Signed-off-by: Alexander Holler <holler@ahsoftware.de>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Alexander Holler 2012-12-15 12:45:00 +00:00 committed by Jonathan Cameron
parent 62e00cb9a3
commit e07c6d170c
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/accel/hid-sensor-accel-3d.c
View File

@ -43,7 +43,7 @@ enum accel_3d_channel {
struct accel_3d_state { struct accel_3d_state {
struct hid_sensor_hub_callbacks callbacks; struct hid_sensor_hub_callbacks callbacks;
struct hid_sensor_iio_common common_attributes; struct hid_sensor_common common_attributes;
struct hid_sensor_hub_attribute_info accel[ACCEL_3D_CHANNEL_MAX]; struct hid_sensor_hub_attribute_info accel[ACCEL_3D_CHANNEL_MAX];
u32 accel_val[ACCEL_3D_CHANNEL_MAX]; u32 accel_val[ACCEL_3D_CHANNEL_MAX];
}; };

10
drivers/iio/common/hid-sensors/hid-sensor-attributes.c
View File

@ -113,7 +113,7 @@ static u32 convert_to_vtf_format(int size, int exp, int val1, int val2)
return value; return value;
} }
int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st, int hid_sensor_read_samp_freq_value(struct hid_sensor_common *st,
int *val1, int *val2) int *val1, int *val2)
{ {
s32 value; s32 value;
@ -140,7 +140,7 @@ int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
} }
EXPORT_SYMBOL(hid_sensor_read_samp_freq_value); EXPORT_SYMBOL(hid_sensor_read_samp_freq_value);
int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st, int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
int val1, int val2) int val1, int val2)
{ {
s32 value; s32 value;
@ -168,7 +168,7 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
} }
EXPORT_SYMBOL(hid_sensor_write_samp_freq_value); EXPORT_SYMBOL(hid_sensor_write_samp_freq_value);
int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st, int hid_sensor_read_raw_hyst_value(struct hid_sensor_common *st,
int *val1, int *val2) int *val1, int *val2)
{ {
s32 value; s32 value;
@ -190,7 +190,7 @@ int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
} }
EXPORT_SYMBOL(hid_sensor_read_raw_hyst_value); EXPORT_SYMBOL(hid_sensor_read_raw_hyst_value);
int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st, int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
int val1, int val2) int val1, int val2)
{ {
s32 value; s32 value;
@ -211,7 +211,7 @@ EXPORT_SYMBOL(hid_sensor_write_raw_hyst_value);
int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev, int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
u32 usage_id, u32 usage_id,
struct hid_sensor_iio_common *st) struct hid_sensor_common *st)
{ {
sensor_hub_input_get_attribute_info(hsdev, sensor_hub_input_get_attribute_info(hsdev,

4
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
View File

@ -31,7 +31,7 @@
static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig, static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
bool state) bool state)
{ {
struct hid_sensor_iio_common *st = trig->private_data; struct hid_sensor_common *st = trig->private_data;
int state_val; int state_val;
state_val = state ? 1 : 0; state_val = state ? 1 : 0;
@ -63,7 +63,7 @@ static const struct iio_trigger_ops hid_sensor_trigger_ops = {
}; };
int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name, int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
struct hid_sensor_iio_common *attrb) struct hid_sensor_common *attrb)
{ {
int ret; int ret;
struct iio_trigger *trig; struct iio_trigger *trig;

2
drivers/iio/common/hid-sensors/hid-sensor-trigger.h
View File

@ -20,7 +20,7 @@
#define _HID_SENSOR_TRIGGER_H #define _HID_SENSOR_TRIGGER_H
int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name, int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
struct hid_sensor_iio_common *attrb); struct hid_sensor_common *attrb);
void hid_sensor_remove_trigger(struct iio_dev *indio_dev); void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
#endif #endif

2
drivers/iio/gyro/hid-sensor-gyro-3d.c
View File

@ -43,7 +43,7 @@ enum gyro_3d_channel {
struct gyro_3d_state { struct gyro_3d_state {
struct hid_sensor_hub_callbacks callbacks; struct hid_sensor_hub_callbacks callbacks;
struct hid_sensor_iio_common common_attributes; struct hid_sensor_common common_attributes;
struct hid_sensor_hub_attribute_info gyro[GYRO_3D_CHANNEL_MAX]; struct hid_sensor_hub_attribute_info gyro[GYRO_3D_CHANNEL_MAX];
u32 gyro_val[GYRO_3D_CHANNEL_MAX]; u32 gyro_val[GYRO_3D_CHANNEL_MAX];
}; };

2
drivers/iio/light/hid-sensor-als.c
View File

@ -38,7 +38,7 @@
struct als_state { struct als_state {
struct hid_sensor_hub_callbacks callbacks; struct hid_sensor_hub_callbacks callbacks;
struct hid_sensor_iio_common common_attributes; struct hid_sensor_common common_attributes;
struct hid_sensor_hub_attribute_info als_illum; struct hid_sensor_hub_attribute_info als_illum;
u32 illum; u32 illum;
}; };

2
drivers/iio/magnetometer/hid-sensor-magn-3d.c
View File

@ -43,7 +43,7 @@ enum magn_3d_channel {
struct magn_3d_state { struct magn_3d_state {
struct hid_sensor_hub_callbacks callbacks; struct hid_sensor_hub_callbacks callbacks;
struct hid_sensor_iio_common common_attributes; struct hid_sensor_common common_attributes;
struct hid_sensor_hub_attribute_info magn[MAGN_3D_CHANNEL_MAX]; struct hid_sensor_hub_attribute_info magn[MAGN_3D_CHANNEL_MAX];
u32 magn_val[MAGN_3D_CHANNEL_MAX]; u32 magn_val[MAGN_3D_CHANNEL_MAX];
}; };

2
drivers/rtc/rtc-hid-sensor-time.c
View File

@ -39,7 +39,7 @@ enum hid_time_channel {
struct hid_time_state { struct hid_time_state {
struct hid_sensor_hub_callbacks callbacks; struct hid_sensor_hub_callbacks callbacks;
struct hid_sensor_iio_common common_attributes; struct hid_sensor_common common_attributes;
struct hid_sensor_hub_attribute_info info[TIME_RTC_CHANNEL_MAX]; struct hid_sensor_hub_attribute_info info[TIME_RTC_CHANNEL_MAX];
struct rtc_time last_time; struct rtc_time last_time;
spinlock_t lock_last_time; spinlock_t lock_last_time;

12
include/linux/hid-sensor-hub.h
View File

@ -161,7 +161,7 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
/* hid-sensor-attributes */ /* hid-sensor-attributes */
/* Common hid sensor iio structure */ /* Common hid sensor iio structure */
struct hid_sensor_iio_common { struct hid_sensor_common {
struct hid_sensor_hub_device *hsdev; struct hid_sensor_hub_device *hsdev;
struct platform_device *pdev; struct platform_device *pdev;
unsigned usage_id; unsigned usage_id;
@ -185,14 +185,14 @@ static inline int hid_sensor_convert_exponent(int unit_expo)
int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev, int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
u32 usage_id, u32 usage_id,
struct hid_sensor_iio_common *st); struct hid_sensor_common *st);
int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st, int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
int val1, int val2); int val1, int val2);
int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st, int hid_sensor_read_raw_hyst_value(struct hid_sensor_common *st,
int *val1, int *val2); int *val1, int *val2);
int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st, int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
int val1, int val2); int val1, int val2);
int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st, int hid_sensor_read_samp_freq_value(struct hid_sensor_common *st,
int *val1, int *val2); int *val1, int *val2);
#endif #endif