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

Commit 845bd12a authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio: use the new central name attribute creation code 



Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1b732888

drivers/staging/iio/accel/adis16201_core.c

+1 −3
Original line number Diff line number Diff line
@@ -477,8 +477,6 @@ static IIO_CONST_ATTR(temp_scale, "-0.47"); 


static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16201_write_reset, 0);



static IIO_CONST_ATTR(name, "adis16201");



static struct attribute *adis16201_attributes[] = {

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,
@@ -486,7 +484,6 @@ static struct attribute *adis16201_attributes[] = { 
	&iio_const_attr_temp_offset.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_dev_attr_reset.dev_attr.attr,

	&iio_const_attr_name.dev_attr.attr,

	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_const_attr_in1_scale.dev_attr.attr,

	&iio_dev_attr_accel_x_raw.dev_attr.attr,
@@ -537,6 +534,7 @@ static int __devinit adis16201_probe(struct spi_device *spi) 
		goto error_free_tx;

	}



	st->indio_dev->name = spi->dev.driver->name;

	st->indio_dev->dev.parent = &spi->dev;

	st->indio_dev->attrs = &adis16201_attribute_group;

	st->indio_dev->dev_data = (void *)(st);

drivers/staging/iio/accel/adis16203_core.c

+1 −4
Original line number Diff line number Diff line
@@ -392,8 +392,6 @@ static IIO_CONST_ATTR(temp_scale, "-0.47"); 


static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16203_write_reset, 0);



static IIO_CONST_ATTR(name, "adis16203");



static struct attribute *adis16203_attributes[] = {

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,
@@ -401,7 +399,6 @@ static struct attribute *adis16203_attributes[] = { 
	&iio_const_attr_temp_offset.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_dev_attr_reset.dev_attr.attr,

	&iio_const_attr_name.dev_attr.attr,

	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_const_attr_in1_scale.dev_attr.attr,

	&iio_dev_attr_incli_x_raw.dev_attr.attr,
@@ -445,7 +442,7 @@ static int __devinit adis16203_probe(struct spi_device *spi) 
		ret = -ENOMEM;

		goto error_free_tx;

	}



	st->indio_dev->name = spi->dev.driver->name;

	st->indio_dev->dev.parent = &spi->dev;

	st->indio_dev->attrs = &adis16203_attribute_group;

	st->indio_dev->dev_data = (void *)(st);

drivers/staging/iio/accel/adis16204_core.c

+1 −3
Original line number Diff line number Diff line
@@ -430,8 +430,6 @@ static IIO_CONST_ATTR(temp_scale, "-0.47"); 


static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16204_write_reset, 0);



static IIO_CONST_ATTR(name, "adis16204");



static struct attribute *adis16204_attributes[] = {

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,
@@ -439,7 +437,6 @@ static struct attribute *adis16204_attributes[] = { 
	&iio_const_attr_temp_offset.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_dev_attr_reset.dev_attr.attr,

	&iio_const_attr_name.dev_attr.attr,

	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_const_attr_in1_scale.dev_attr.attr,

	&iio_dev_attr_accel_x_raw.dev_attr.attr,
@@ -491,6 +488,7 @@ static int __devinit adis16204_probe(struct spi_device *spi) 
		goto error_free_tx;

	}



	st->indio_dev->name = spi->dev.driver->name;

	st->indio_dev->dev.parent = &spi->dev;

	st->indio_dev->attrs = &adis16204_attribute_group;

	st->indio_dev->dev_data = (void *)(st);

drivers/staging/iio/accel/adis16209_core.c

+1 −3
Original line number Diff line number Diff line
@@ -427,8 +427,6 @@ static IIO_CONST_ATTR_TEMP_SCALE("-0.47"); 


static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16209_write_reset, 0);



static IIO_CONST_ATTR_NAME("adis16209");



static struct attribute *adis16209_attributes[] = {

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,
@@ -436,7 +434,6 @@ static struct attribute *adis16209_attributes[] = { 
	&iio_const_attr_temp_offset.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_dev_attr_reset.dev_attr.attr,

	&iio_const_attr_name.dev_attr.attr,

	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_const_attr_in1_scale.dev_attr.attr,

	&iio_dev_attr_accel_x_raw.dev_attr.attr,
@@ -486,6 +483,7 @@ static int __devinit adis16209_probe(struct spi_device *spi) 
		goto error_free_tx;

	}



	st->indio_dev->name = spi->dev.driver->name;

	st->indio_dev->dev.parent = &spi->dev;

	st->indio_dev->attrs = &adis16209_attribute_group;

	st->indio_dev->dev_data = (void *)(st);

drivers/staging/iio/accel/adis16220_core.c

+1 −3
Original line number Diff line number Diff line
@@ -521,8 +521,6 @@ static IIO_DEV_ATTR_CAPTURE_COUNT(S_IWUSR | S_IRUGO, 


static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("100200");



static IIO_CONST_ATTR_NAME("adis16220");



static struct attribute *adis16220_attributes[] = {

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,
@@ -539,7 +537,6 @@ static struct attribute *adis16220_attributes[] = { 
	&iio_dev_attr_reset.dev_attr.attr,

	&iio_dev_attr_capture.dev_attr.attr,

	&iio_dev_attr_capture_count.dev_attr.attr,

	&iio_const_attr_name.dev_attr.attr,

	NULL

};
@@ -578,6 +575,7 @@ static int __devinit adis16220_probe(struct spi_device *spi) 
		goto error_free_tx;

	}



	st->indio_dev->name = spi->dev.driver->name;

	st->indio_dev->dev.parent = &spi->dev;

	st->indio_dev->attrs = &adis16220_attribute_group;

	st->indio_dev->dev_data = (void *)(st);