All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Masney <masneyb@onstation.org>
To: jic23@kernel.org, linux-iio@vger.kernel.org
Cc: devel@driverdev.osuosl.org, lars@metafoo.de,
	gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
	Jon.Brenner@ams.com, pmeerw@pmeerw.net, knaack.h@gmx.de
Subject: [PATCH 09/13] staging: iio: tsl2x7x: move power and diode settings into header file
Date: Fri, 20 Apr 2018 20:41:49 -0400	[thread overview]
Message-ID: <20180421004153.19073-10-masneyb@onstation.org> (raw)
In-Reply-To: <20180421004153.19073-1-masneyb@onstation.org>

The power and diode defines are needed for the platform data so this
patch moves the defines out of the .c file and into the header file. A
comment for the diode is also cleaned up while this code is touched.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/staging/iio/light/tsl2x7x.c | 12 ------------
 drivers/staging/iio/light/tsl2x7x.h | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c
index 15bc0af1bb6c..87b99deef7a8 100644
--- a/drivers/staging/iio/light/tsl2x7x.c
+++ b/drivers/staging/iio/light/tsl2x7x.c
@@ -103,18 +103,6 @@
 #define TSL2X7X_CNTL_PROXPON_ENBL	0x0F
 #define TSL2X7X_CNTL_INTPROXPON_ENBL	0x2F
 
-/*Prox diode to use */
-#define TSL2X7X_DIODE0			0x01
-#define TSL2X7X_DIODE1			0x02
-#define TSL2X7X_DIODE_BOTH		0x03
-
-/* LED Power */
-#define TSL2X7X_100_mA			0x00
-#define TSL2X7X_50_mA			0x01
-#define TSL2X7X_25_mA			0x02
-#define TSL2X7X_13_mA			0x03
-#define TSL2X7X_MAX_TIMER_CNT		0xFF
-
 #define TSL2X7X_MIN_ITIME		3
 
 /* TAOS txx2x7x Device family members */
diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h
index 992ee2465609..2c96f0b39b1e 100644
--- a/drivers/staging/iio/light/tsl2x7x.h
+++ b/drivers/staging/iio/light/tsl2x7x.h
@@ -23,6 +23,18 @@ struct tsl2x7x_lux {
 #define TSL2X7X_DEFAULT_TABLE_BYTES (sizeof(struct tsl2x7x_lux) * \
 				     TSL2X7X_DEF_LUX_TABLE_SZ)
 
+/* Proximity diode to use */
+#define TSL2X7X_DIODE0                  0x01
+#define TSL2X7X_DIODE1                  0x02
+#define TSL2X7X_DIODE_BOTH              0x03
+
+/* LED Power */
+#define TSL2X7X_100_mA                  0x00
+#define TSL2X7X_50_mA                   0x01
+#define TSL2X7X_25_mA                   0x02
+#define TSL2X7X_13_mA                   0x03
+#define TSL2X7X_MAX_TIMER_CNT           0xFF
+
 /**
  * struct tsl2x7x_default_settings - power on defaults unless
  *                                   overridden by platform data.
-- 
2.14.3

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

WARNING: multiple messages have this Message-ID (diff)
From: Brian Masney <masneyb@onstation.org>
To: jic23@kernel.org, linux-iio@vger.kernel.org
Cc: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org,
	knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
	linux-kernel@vger.kernel.org, Jon.Brenner@ams.com
Subject: [PATCH 09/13] staging: iio: tsl2x7x: move power and diode settings into header file
Date: Fri, 20 Apr 2018 20:41:49 -0400	[thread overview]
Message-ID: <20180421004153.19073-10-masneyb@onstation.org> (raw)
In-Reply-To: <20180421004153.19073-1-masneyb@onstation.org>

The power and diode defines are needed for the platform data so this
patch moves the defines out of the .c file and into the header file. A
comment for the diode is also cleaned up while this code is touched.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/staging/iio/light/tsl2x7x.c | 12 ------------
 drivers/staging/iio/light/tsl2x7x.h | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c
index 15bc0af1bb6c..87b99deef7a8 100644
--- a/drivers/staging/iio/light/tsl2x7x.c
+++ b/drivers/staging/iio/light/tsl2x7x.c
@@ -103,18 +103,6 @@
 #define TSL2X7X_CNTL_PROXPON_ENBL	0x0F
 #define TSL2X7X_CNTL_INTPROXPON_ENBL	0x2F
 
-/*Prox diode to use */
-#define TSL2X7X_DIODE0			0x01
-#define TSL2X7X_DIODE1			0x02
-#define TSL2X7X_DIODE_BOTH		0x03
-
-/* LED Power */
-#define TSL2X7X_100_mA			0x00
-#define TSL2X7X_50_mA			0x01
-#define TSL2X7X_25_mA			0x02
-#define TSL2X7X_13_mA			0x03
-#define TSL2X7X_MAX_TIMER_CNT		0xFF
-
 #define TSL2X7X_MIN_ITIME		3
 
 /* TAOS txx2x7x Device family members */
diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h
index 992ee2465609..2c96f0b39b1e 100644
--- a/drivers/staging/iio/light/tsl2x7x.h
+++ b/drivers/staging/iio/light/tsl2x7x.h
@@ -23,6 +23,18 @@ struct tsl2x7x_lux {
 #define TSL2X7X_DEFAULT_TABLE_BYTES (sizeof(struct tsl2x7x_lux) * \
 				     TSL2X7X_DEF_LUX_TABLE_SZ)
 
+/* Proximity diode to use */
+#define TSL2X7X_DIODE0                  0x01
+#define TSL2X7X_DIODE1                  0x02
+#define TSL2X7X_DIODE_BOTH              0x03
+
+/* LED Power */
+#define TSL2X7X_100_mA                  0x00
+#define TSL2X7X_50_mA                   0x01
+#define TSL2X7X_25_mA                   0x02
+#define TSL2X7X_13_mA                   0x03
+#define TSL2X7X_MAX_TIMER_CNT           0xFF
+
 /**
  * struct tsl2x7x_default_settings - power on defaults unless
  *                                   overridden by platform data.
-- 
2.14.3


  parent reply	other threads:[~2018-04-21  0:41 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-21  0:41 [PATCH 00/13] iio: tsl2x7x: staging cleanups Brian Masney
2018-04-21  0:41 ` Brian Masney
2018-04-21  0:41 ` [PATCH 01/13] staging: iio: tsl2x7x: move integration_time* attributes to IIO_INTENSITY channel Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:13   ` Jonathan Cameron
2018-04-21 16:13     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 02/13] staging: iio: tsl2x7x: use GPL-2.0+ SPDX license identifier Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:16   ` Jonathan Cameron
2018-04-21 16:16     ` Jonathan Cameron
2018-04-21 17:04     ` Brian Masney
2018-04-21 17:04       ` Brian Masney
2018-04-21  0:41 ` [PATCH 03/13] staging: iio: tsl2x7x: don't return error in IRQ handler Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:18   ` Jonathan Cameron
2018-04-21 16:18     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 04/13] staging: iio: tsl2x7x: simplify tsl2x7x_clear_interrupts function Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:20   ` Jonathan Cameron
2018-04-21 16:20     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 05/13] staging: iio: tsl2x7x: remove unnecessary chip status checks in suspend/resume Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:23   ` Jonathan Cameron
2018-04-21 16:23     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 06/13] staging: iio: tsl2x7x: simplify tsl2x7x_write_interrupt_config return Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:25   ` Jonathan Cameron
2018-04-21 16:25     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 07/13] staging: iio: tsl2x7x: simplify device id verification Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:26   ` Jonathan Cameron
2018-04-21 16:26     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 08/13] staging: iio: tsl2x7x: add range checking to three sysfs attributes Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:31   ` Jonathan Cameron
2018-04-21 16:31     ` Jonathan Cameron
2018-04-21  0:41 ` Brian Masney [this message]
2018-04-21  0:41   ` [PATCH 09/13] staging: iio: tsl2x7x: move power and diode settings into header file Brian Masney
2018-04-21 16:33   ` Jonathan Cameron
2018-04-21 16:33     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 10/13] staging: iio: tsl2x7x: rename prx to prox for consistency Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:33   ` Jonathan Cameron
2018-04-21 16:33     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 11/13] staging: iio: tsl2x7x: use device defaults for als_time, prox_time and wait_time Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:39   ` Jonathan Cameron
2018-04-21 16:39     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 12/13] staging: iio: tsl2x7x: various comment cleanups Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:37   ` Jonathan Cameron
2018-04-21 16:37     ` Jonathan Cameron
2018-04-21  0:41 ` [PATCH 13/13] staging: iio: tsl2x7x: rename prox_config to als_prox_config Brian Masney
2018-04-21  0:41   ` Brian Masney
2018-04-21 16:38   ` Jonathan Cameron
2018-04-21 16:38     ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180421004153.19073-10-masneyb@onstation.org \
    --to=masneyb@onstation.org \
    --cc=Jon.Brenner@ams.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.