tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: iio: Make use of the convenient IIO_TRIGGER_NAME_ATTR macro

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Jonathan Cameron and committed by
Greg Kroah-Hartman 9dbfb6f1 2d7770a9

+10 -19
+1 -1
drivers/staging/iio/accel/adis16209_trigger.c
··· 30 30 31 31 IIO_EVENT_SH(data_rdy_trig, &adis16209_data_rdy_trig_poll); 32 32 33 - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); 33 + static IIO_TRIGGER_NAME_ATTR; 34 34 35 35 static struct attribute *adis16209_trigger_attrs[] = { 36 36 &dev_attr_name.attr,
+1 -1
drivers/staging/iio/accel/adis16240_trigger.c
··· 30 30 31 31 IIO_EVENT_SH(data_rdy_trig, &adis16240_data_rdy_trig_poll); 32 32 33 - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); 33 + static IIO_TRIGGER_NAME_ATTR; 34 34 35 35 static struct attribute *adis16240_trigger_attrs[] = { 36 36 &dev_attr_name.attr,
+2 -1
drivers/staging/iio/accel/lis3l02dq_ring.c
··· 382 382 &t); 383 383 return ret; 384 384 } 385 - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); 385 + 386 + static IIO_TRIGGER_NAME_ATTR; 386 387 387 388 static struct attribute *lis3l02dq_trigger_attrs[] = { 388 389 &dev_attr_name.attr,
+1 -1
drivers/staging/iio/gyro/adis16260_trigger.c
··· 30 30 31 31 IIO_EVENT_SH(data_rdy_trig, &adis16260_data_rdy_trig_poll); 32 32 33 - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); 33 + static IIO_TRIGGER_NAME_ATTR; 34 34 35 35 static struct attribute *adis16260_trigger_attrs[] = { 36 36 &dev_attr_name.attr,
+1 -1
drivers/staging/iio/imu/adis16300_trigger.c
··· 30 30 31 31 IIO_EVENT_SH(data_rdy_trig, &adis16300_data_rdy_trig_poll); 32 32 33 - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); 33 + static IIO_TRIGGER_NAME_ATTR; 34 34 35 35 static struct attribute *adis16300_trigger_attrs[] = { 36 36 &dev_attr_name.attr,
+1 -1
drivers/staging/iio/imu/adis16350_trigger.c
··· 30 30 31 31 IIO_EVENT_SH(data_rdy_trig, &adis16350_data_rdy_trig_poll); 32 32 33 - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); 33 + static IIO_TRIGGER_NAME_ATTR; 34 34 35 35 static struct attribute *adis16350_trigger_attrs[] = { 36 36 &dev_attr_name.attr,
+1 -1
drivers/staging/iio/imu/adis16400_trigger.c
··· 30 30 31 31 IIO_EVENT_SH(data_rdy_trig, &adis16400_data_rdy_trig_poll); 32 32 33 - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); 33 + static IIO_TRIGGER_NAME_ATTR; 34 34 35 35 static struct attribute *adis16400_trigger_attrs[] = { 36 36 &dev_attr_name.attr,
+1 -1
drivers/staging/iio/trigger/iio-trig-gpio.c
··· 47 47 return IRQ_HANDLED; 48 48 } 49 49 50 - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); 50 + static IIO_TRIGGER_NAME_ATTR; 51 51 52 52 static struct attribute *iio_gpio_trigger_attrs[] = { 53 53 &dev_attr_name.attr,
+1 -11
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
··· 72 72 return ret; 73 73 } 74 74 75 - static ssize_t iio_trig_periodic_read_name(struct device *dev, 76 - struct device_attribute *attr, 77 - char *buf) 78 - { 79 - struct iio_trigger *trig = dev_get_drvdata(dev); 80 - return sprintf(buf, "%s\n", trig->name); 81 - } 82 - 83 - static DEVICE_ATTR(name, S_IRUGO, 84 - iio_trig_periodic_read_name, 85 - NULL); 75 + static IIO_TRIGGER_NAME_ATTR; 86 76 static DEVICE_ATTR(frequency, S_IRUGO | S_IWUSR, 87 77 iio_trig_periodic_read_freq, 88 78 iio_trig_periodic_write_freq);