* [PATCH 1/2] iio: adjd_s311: Fix non-scan mode data read
@ 2013-08-18 12:59 Peter Meerwald
2013-08-18 12:59 ` [PATCH 2/2] iio: adjd_s311: Cleanup unused #defines Peter Meerwald
2013-08-19 18:54 ` [PATCH 1/2] iio: adjd_s311: Fix non-scan mode data read Jonathan Cameron
0 siblings, 2 replies; 4+ messages in thread
From: Peter Meerwald @ 2013-08-18 12:59 UTC (permalink / raw)
To: linux-iio; +Cc: Peter Meerwald
forgot to convert channel index to data register
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
drivers/iio/light/adjd_s311.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index 55b9e18..c4b730d 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -232,7 +232,8 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev,
switch (mask) {
case IIO_CHAN_INFO_RAW:
- ret = adjd_s311_read_data(indio_dev, chan->address, val);
+ ret = adjd_s311_read_data(indio_dev,
+ ADJD_S311_DATA_REG(chan->address), val);
if (ret < 0)
return ret;
return IIO_VAL_INT;
--
1.8.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] iio: adjd_s311: Cleanup unused #defines
2013-08-18 12:59 [PATCH 1/2] iio: adjd_s311: Fix non-scan mode data read Peter Meerwald
@ 2013-08-18 12:59 ` Peter Meerwald
2013-08-19 19:12 ` Jonathan Cameron
2013-08-19 18:54 ` [PATCH 1/2] iio: adjd_s311: Fix non-scan mode data read Jonathan Cameron
1 sibling, 1 reply; 4+ messages in thread
From: Peter Meerwald @ 2013-08-18 12:59 UTC (permalink / raw)
To: linux-iio; +Cc: Peter Meerwald
using word reads, no need for HI/LO register #defines
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
drivers/iio/light/adjd_s311.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index c4b730d..23cff79 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -37,22 +37,14 @@
#define ADJD_S311_CAP_GREEN 0x07
#define ADJD_S311_CAP_BLUE 0x08
#define ADJD_S311_CAP_CLEAR 0x09
-#define ADJD_S311_INT_RED_LO 0x0a
-#define ADJD_S311_INT_RED_HI 0x0b
-#define ADJD_S311_INT_GREEN_LO 0x0c
-#define ADJD_S311_INT_GREEN_HI 0x0d
-#define ADJD_S311_INT_BLUE_LO 0x0e
-#define ADJD_S311_INT_BLUE_HI 0x0f
-#define ADJD_S311_INT_CLEAR_LO 0x10
-#define ADJD_S311_INT_CLEAR_HI 0x11
-#define ADJD_S311_DATA_RED_LO 0x40
-#define ADJD_S311_DATA_RED_HI 0x41
-#define ADJD_S311_DATA_GREEN_LO 0x42
-#define ADJD_S311_DATA_GREEN_HI 0x43
-#define ADJD_S311_DATA_BLUE_LO 0x44
-#define ADJD_S311_DATA_BLUE_HI 0x45
-#define ADJD_S311_DATA_CLEAR_LO 0x46
-#define ADJD_S311_DATA_CLEAR_HI 0x47
+#define ADJD_S311_INT_RED 0x0a
+#define ADJD_S311_INT_GREEN 0x0c
+#define ADJD_S311_INT_BLUE 0x0e
+#define ADJD_S311_INT_CLEAR 0x10
+#define ADJD_S311_DATA_RED 0x40
+#define ADJD_S311_DATA_GREEN 0x42
+#define ADJD_S311_DATA_BLUE 0x44
+#define ADJD_S311_DATA_CLEAR 0x46
#define ADJD_S311_OFFSET_RED 0x48
#define ADJD_S311_OFFSET_GREEN 0x49
#define ADJD_S311_OFFSET_BLUE 0x4a
@@ -73,8 +65,8 @@ enum adjd_s311_channel_idx {
IDX_RED, IDX_GREEN, IDX_BLUE, IDX_CLEAR
};
-#define ADJD_S311_DATA_REG(chan) (ADJD_S311_DATA_RED_LO + (chan) * 2)
-#define ADJD_S311_INT_REG(chan) (ADJD_S311_INT_RED_LO + (chan) * 2)
+#define ADJD_S311_DATA_REG(chan) (ADJD_S311_DATA_RED + (chan) * 2)
+#define ADJD_S311_INT_REG(chan) (ADJD_S311_INT_RED + (chan) * 2)
#define ADJD_S311_CAP_REG(chan) (ADJD_S311_CAP_RED + (chan))
static int adjd_s311_req_data(struct iio_dev *indio_dev)
--
1.8.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] iio: adjd_s311: Cleanup unused #defines
2013-08-18 12:59 ` [PATCH 2/2] iio: adjd_s311: Cleanup unused #defines Peter Meerwald
@ 2013-08-19 19:12 ` Jonathan Cameron
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2013-08-19 19:12 UTC (permalink / raw)
To: Peter Meerwald; +Cc: linux-iio
On 08/18/13 13:59, Peter Meerwald wrote:
> using word reads, no need for HI/LO register #defines
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the togreg branch of iio.git.
Thanks Peter
> ---
> drivers/iio/light/adjd_s311.c | 28 ++++++++++------------------
> 1 file changed, 10 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
> index c4b730d..23cff79 100644
> --- a/drivers/iio/light/adjd_s311.c
> +++ b/drivers/iio/light/adjd_s311.c
> @@ -37,22 +37,14 @@
> #define ADJD_S311_CAP_GREEN 0x07
> #define ADJD_S311_CAP_BLUE 0x08
> #define ADJD_S311_CAP_CLEAR 0x09
> -#define ADJD_S311_INT_RED_LO 0x0a
> -#define ADJD_S311_INT_RED_HI 0x0b
> -#define ADJD_S311_INT_GREEN_LO 0x0c
> -#define ADJD_S311_INT_GREEN_HI 0x0d
> -#define ADJD_S311_INT_BLUE_LO 0x0e
> -#define ADJD_S311_INT_BLUE_HI 0x0f
> -#define ADJD_S311_INT_CLEAR_LO 0x10
> -#define ADJD_S311_INT_CLEAR_HI 0x11
> -#define ADJD_S311_DATA_RED_LO 0x40
> -#define ADJD_S311_DATA_RED_HI 0x41
> -#define ADJD_S311_DATA_GREEN_LO 0x42
> -#define ADJD_S311_DATA_GREEN_HI 0x43
> -#define ADJD_S311_DATA_BLUE_LO 0x44
> -#define ADJD_S311_DATA_BLUE_HI 0x45
> -#define ADJD_S311_DATA_CLEAR_LO 0x46
> -#define ADJD_S311_DATA_CLEAR_HI 0x47
> +#define ADJD_S311_INT_RED 0x0a
> +#define ADJD_S311_INT_GREEN 0x0c
> +#define ADJD_S311_INT_BLUE 0x0e
> +#define ADJD_S311_INT_CLEAR 0x10
> +#define ADJD_S311_DATA_RED 0x40
> +#define ADJD_S311_DATA_GREEN 0x42
> +#define ADJD_S311_DATA_BLUE 0x44
> +#define ADJD_S311_DATA_CLEAR 0x46
> #define ADJD_S311_OFFSET_RED 0x48
> #define ADJD_S311_OFFSET_GREEN 0x49
> #define ADJD_S311_OFFSET_BLUE 0x4a
> @@ -73,8 +65,8 @@ enum adjd_s311_channel_idx {
> IDX_RED, IDX_GREEN, IDX_BLUE, IDX_CLEAR
> };
>
> -#define ADJD_S311_DATA_REG(chan) (ADJD_S311_DATA_RED_LO + (chan) * 2)
> -#define ADJD_S311_INT_REG(chan) (ADJD_S311_INT_RED_LO + (chan) * 2)
> +#define ADJD_S311_DATA_REG(chan) (ADJD_S311_DATA_RED + (chan) * 2)
> +#define ADJD_S311_INT_REG(chan) (ADJD_S311_INT_RED + (chan) * 2)
> #define ADJD_S311_CAP_REG(chan) (ADJD_S311_CAP_RED + (chan))
>
> static int adjd_s311_req_data(struct iio_dev *indio_dev)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] iio: adjd_s311: Fix non-scan mode data read
2013-08-18 12:59 [PATCH 1/2] iio: adjd_s311: Fix non-scan mode data read Peter Meerwald
2013-08-18 12:59 ` [PATCH 2/2] iio: adjd_s311: Cleanup unused #defines Peter Meerwald
@ 2013-08-19 18:54 ` Jonathan Cameron
1 sibling, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2013-08-19 18:54 UTC (permalink / raw)
To: Peter Meerwald; +Cc: linux-iio
On 08/18/13 13:59, Peter Meerwald wrote:
> forgot to convert channel index to data register
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the fixes-togreg branch of iio.git
Thanks,
Jonathan
> ---
> drivers/iio/light/adjd_s311.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
> index 55b9e18..c4b730d 100644
> --- a/drivers/iio/light/adjd_s311.c
> +++ b/drivers/iio/light/adjd_s311.c
> @@ -232,7 +232,8 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev,
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> - ret = adjd_s311_read_data(indio_dev, chan->address, val);
> + ret = adjd_s311_read_data(indio_dev,
> + ADJD_S311_DATA_REG(chan->address), val);
> if (ret < 0)
> return ret;
> return IIO_VAL_INT;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-19 18:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-18 12:59 [PATCH 1/2] iio: adjd_s311: Fix non-scan mode data read Peter Meerwald
2013-08-18 12:59 ` [PATCH 2/2] iio: adjd_s311: Cleanup unused #defines Peter Meerwald
2013-08-19 19:12 ` Jonathan Cameron
2013-08-19 18:54 ` [PATCH 1/2] iio: adjd_s311: Fix non-scan mode data read Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).