Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: iio: tsl2563 event attribute name updates

Browse source 
Patch also renames the two raw channels to add numbers
so that we know to which channel the event code applies.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2010-10-08 12:14:10 +01:00 committed by Greg Kroah-Hartman
parent d750e375c1
commit 45dd3b340b
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/staging/iio/light/tsl2563.c
View file

@ -584,14 +584,14 @@ static ssize_t tsl2563_calib_store(struct device *dev,
return len;
}
static IIO_DEVICE_ATTR(intensity_both_raw, S_IRUGO,
static IIO_DEVICE_ATTR(intensity0_both_raw, S_IRUGO,
tsl2563_adc_show, NULL, 0);
static IIO_DEVICE_ATTR(intensity_ir_raw, S_IRUGO,
static IIO_DEVICE_ATTR(intensity1_ir_raw, S_IRUGO,
tsl2563_adc_show, NULL, 1);
static DEVICE_ATTR(illuminance0_input, S_IRUGO, tsl2563_lux_show, NULL);
static IIO_DEVICE_ATTR(intensity_both_calibgain, S_IRUGO | S_IWUSR,
static IIO_DEVICE_ATTR(intensity0_both_calibgain, S_IRUGO | S_IWUSR,
tsl2563_calib_show, tsl2563_calib_store, 0);
static IIO_DEVICE_ATTR(intensity_ir_calibgain, S_IRUGO | S_IWUSR,
static IIO_DEVICE_ATTR(intensity1_ir_calibgain, S_IRUGO | S_IWUSR,
tsl2563_calib_show, tsl2563_calib_store, 1);
static ssize_t tsl2563_show_name(struct device *dev,
@ -606,11 +606,11 @@ static ssize_t tsl2563_show_name(struct device *dev,
static DEVICE_ATTR(name, S_IRUGO, tsl2563_show_name, NULL);
static struct attribute *tsl2563_attributes[] = {
&iio_dev_attr_intensity_both_raw.dev_attr.attr,
&iio_dev_attr_intensity_ir_raw.dev_attr.attr,
&iio_dev_attr_intensity0_both_raw.dev_attr.attr,
&iio_dev_attr_intensity1_ir_raw.dev_attr.attr,
&dev_attr_illuminance0_input.attr,
&iio_dev_attr_intensity_both_calibgain.dev_attr.attr,
&iio_dev_attr_intensity_ir_calibgain.dev_attr.attr,
&iio_dev_attr_intensity0_both_calibgain.dev_attr.attr,
&iio_dev_attr_intensity1_ir_calibgain.dev_attr.attr,
&dev_attr_name.attr,
NULL
};
@ -673,13 +673,13 @@ static ssize_t tsl2563_write_thresh(struct device *dev,
return ret < 0 ? ret : len;
}
static IIO_DEVICE_ATTR(intensity_both_thresh_high_value,
static IIO_DEVICE_ATTR(intensity0_both_raw_thresh_rising_value,
S_IRUGO | S_IWUSR,
tsl2563_read_thresh,
tsl2563_write_thresh,
TSL2563_REG_HIGHLOW);
static IIO_DEVICE_ATTR(intensity_both_thresh_low_value,
static IIO_DEVICE_ATTR(intensity0_both_raw_thresh_falling_value,
S_IRUGO | S_IWUSR,
tsl2563_read_thresh,
tsl2563_write_thresh,
@ -791,16 +791,16 @@ static ssize_t tsl2563_read_interrupt_config(struct device *dev,
return (ret < 0) ? ret : len;
}
IIO_EVENT_ATTR(intensity_both_thresh_both_en,
IIO_EVENT_ATTR(intensity0_both_thresh_en,
tsl2563_read_interrupt_config,
tsl2563_write_interrupt_config,
0,
tsl2563_int_th);
static struct attribute *tsl2563_event_attributes[] = {
&iio_event_attr_intensity_both_thresh_both_en.dev_attr.attr,
&iio_dev_attr_intensity_both_thresh_high_value.dev_attr.attr,
&iio_dev_attr_intensity_both_thresh_low_value.dev_attr.attr,
&iio_event_attr_intensity0_both_thresh_en.dev_attr.attr,
&iio_dev_attr_intensity0_both_raw_thresh_rising_value.dev_attr.attr,
&iio_dev_attr_intensity0_both_raw_thresh_falling_value.dev_attr.attr,
NULL,
};