[Linux-kernel-commits] [9643] trunk/drivers/staging/iio/dac: merge from upstream: staging: iio: dac: Update drivers to use new attribute naming

Tue, 01 Mar 2011 12:57:07 -0800

Title: [9643] trunk/drivers/staging/iio/dac: merge from upstream: staging: iio: dac: Update drivers to use new attribute naming
Revision
9643
Author
vapier
Date
2011-03-01 15:56:59 -0500 (Tue, 01 Mar 2011)

Log Message

merge from upstream: staging: iio: dac: Update drivers to use new attribute naming

From: Michael Hennerich <[email protected]>

Remove depreciated macro from header

Signed-off-by: Michael Hennerich <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Modified Paths

Diff

Modified: trunk/drivers/staging/iio/dac/ad5624r_spi.c (9642 => 9643)


--- trunk/drivers/staging/iio/dac/ad5624r_spi.c	2011-03-01 20:56:55 UTC (rev 9642)
+++ trunk/drivers/staging/iio/dac/ad5624r_spi.c	2011-03-01 20:56:59 UTC (rev 9643)
@@ -180,10 +180,10 @@
 	return ret ? ret : len;
 }
 
-static IIO_DEV_ATTR_DAC(0, ad5624r_write_dac, AD5624R_ADDR_DAC0);
-static IIO_DEV_ATTR_DAC(1, ad5624r_write_dac, AD5624R_ADDR_DAC1);
-static IIO_DEV_ATTR_DAC(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
-static IIO_DEV_ATTR_DAC(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
+static IIO_DEV_ATTR_OUT_RAW(0, ad5624r_write_dac, AD5624R_ADDR_DAC0);
+static IIO_DEV_ATTR_OUT_RAW(1, ad5624r_write_dac, AD5624R_ADDR_DAC1);
+static IIO_DEV_ATTR_OUT_RAW(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
+static IIO_DEV_ATTR_OUT_RAW(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
 
 static IIO_DEVICE_ATTR(ldac_mode, S_IRUGO | S_IWUSR, ad5624r_read_ldac_mode,
 		ad5624r_write_ldac_mode, 0);
@@ -199,10 +199,10 @@
 static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 3);
 
 static struct attribute *ad5624r_attributes[] = {
-	&iio_dev_attr_dac_0.dev_attr.attr,
-	&iio_dev_attr_dac_1.dev_attr.attr,
-	&iio_dev_attr_dac_2.dev_attr.attr,
-	&iio_dev_attr_dac_3.dev_attr.attr,
+	&iio_dev_attr_out0_raw.dev_attr.attr,
+	&iio_dev_attr_out1_raw.dev_attr.attr,
+	&iio_dev_attr_out2_raw.dev_attr.attr,
+	&iio_dev_attr_out3_raw.dev_attr.attr,
 	&iio_dev_attr_dac_power_mode_0.dev_attr.attr,
 	&iio_dev_attr_dac_power_mode_1.dev_attr.attr,
 	&iio_dev_attr_dac_power_mode_2.dev_attr.attr,

Modified: trunk/drivers/staging/iio/dac/dac.h (9642 => 9643)


--- trunk/drivers/staging/iio/dac/dac.h	2011-03-01 20:56:55 UTC (rev 9642)
+++ trunk/drivers/staging/iio/dac/dac.h	2011-03-01 20:56:59 UTC (rev 9643)
@@ -2,9 +2,5 @@
  * dac.h - sysfs attributes associated with DACs
  */
 
-/* Deprecated */
-#define IIO_DEV_ATTR_DAC(_num, _store, _addr)			\
-	IIO_DEVICE_ATTR(dac_##_num, S_IWUSR, NULL, _store, _addr)
-
 #define IIO_DEV_ATTR_OUT_RAW(_num, _store, _addr)				\
 	IIO_DEVICE_ATTR(out##_num##_raw, S_IWUSR, NULL, _store, _addr)

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to