[Linux-kernel-commits] [9333] trunk/drivers/staging/iio/magnetometer/magnet.h: merge from upstream : staging: iio: Change GAIN macros to SCALE.

Sun, 24 Oct 2010 13:39:57 -0700

Title: [9333] trunk/drivers/staging/iio/magnetometer/magnet.h: merge from upstream: staging: iio: Change GAIN macros to SCALE.
Revision
9333
Author
vapier
Date
2010-10-24 16:39:47 -0400 (Sun, 24 Oct 2010)

Log Message

merge from upstream: staging: iio: Change GAIN macros to SCALE.

From: Andrew Chew <[email protected]>

Per email exchange with Jonathan Cameron, GAIN should instead be SCALE, to
be consistent with documentation.

Resending, since this goes with the 2/2 patch.

Signed-off-by: Andrew Chew <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Laxman Dewangan <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Modified Paths

Diff

Modified: trunk/drivers/staging/iio/magnetometer/magnet.h (9332 => 9333)


--- trunk/drivers/staging/iio/magnetometer/magnet.h	2010-10-24 20:39:43 UTC (rev 9332)
+++ trunk/drivers/staging/iio/magnetometer/magnet.h	2010-10-24 20:39:47 UTC (rev 9333)
@@ -12,14 +12,14 @@
 #define IIO_DEV_ATTR_MAGN_Z_OFFSET(_mode, _show, _store, _addr)	\
 	IIO_DEVICE_ATTR(magn_z_offset, _mode, _show, _store, _addr)
 
-#define IIO_DEV_ATTR_MAGN_X_GAIN(_mode, _show, _store, _addr)		\
-	IIO_DEVICE_ATTR(magn_x_gain, _mode, _show, _store, _addr)
+#define IIO_DEV_ATTR_MAGN_X_SCALE(_mode, _show, _store, _addr)		\
+	IIO_DEVICE_ATTR(magn_x_scale, _mode, _show, _store, _addr)
 
-#define IIO_DEV_ATTR_MAGN_Y_GAIN(_mode, _show, _store, _addr)		\
-	IIO_DEVICE_ATTR(magn_y_gain, _mode, _show, _store, _addr)
+#define IIO_DEV_ATTR_MAGN_Y_SCALE(_mode, _show, _store, _addr)		\
+	IIO_DEVICE_ATTR(magn_y_scale, _mode, _show, _store, _addr)
 
-#define IIO_DEV_ATTR_MAGN_Z_GAIN(_mode, _show, _store, _addr)		\
-	IIO_DEVICE_ATTR(magn_z_gain, _mode, _show, _store, _addr)
+#define IIO_DEV_ATTR_MAGN_Z_SCALE(_mode, _show, _store, _addr)		\
+	IIO_DEVICE_ATTR(magn_z_scale, _mode, _show, _store, _addr)
 
 #define IIO_DEV_ATTR_MAGN_X(_show, _addr)				\
 	IIO_DEVICE_ATTR(magn_x_raw, S_IRUGO, _show, NULL, _addr)

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

Reply via email to