* [PATCH] iio: light: ltr501: Fix alignment to match open parenthesis
@ 2015-04-09 14:17 Daniel Baluta
2015-04-09 14:51 ` Kuppuswamy, Sathyanarayanan
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Baluta @ 2015-04-09 14:17 UTC (permalink / raw)
To: jic23
Cc: knaack.h, lars, pmeerw, daniel.baluta, linux-iio, linux-kernel,
sathyanarayanan.kuppuswamy
This makes ltr501 code consistent with the coding style adopted
for the new drivers added to IIO.
We prepare the path for adding support for LTR559 chip.
Reported by checkpatch.pl
Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
---
Changes since v1:
* rebased on top of 1ca510b0ea6 ("iio: light: ltr501: Powerdown device on error")
* separated from path series related to LTR559 support because there are still things
to do there: http://marc.info/?l=linux-kernel&m=142779827617036&w=2
drivers/iio/light/ltr501.c | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c
index 78b8783..f208c98 100644
--- a/drivers/iio/light/ltr501.c
+++ b/drivers/iio/light/ltr501.c
@@ -58,7 +58,7 @@ static int ltr501_drdy(struct ltr501_data *data, u8 drdy_mask)
while (tries--) {
ret = i2c_smbus_read_byte_data(data->client,
- LTR501_ALS_PS_STATUS);
+ LTR501_ALS_PS_STATUS);
if (ret < 0)
return ret;
if ((ret & drdy_mask) == drdy_mask)
@@ -77,7 +77,8 @@ static int ltr501_read_als(struct ltr501_data *data, __le16 buf[2])
return ret;
/* always read both ALS channels in given order */
return i2c_smbus_read_i2c_block_data(data->client,
- LTR501_ALS_DATA1, 2 * sizeof(__le16), (u8 *) buf);
+ LTR501_ALS_DATA1,
+ 2 * sizeof(__le16), (u8 *)buf);
}
static int ltr501_read_ps(struct ltr501_data *data)
@@ -107,7 +108,7 @@ static int ltr501_read_ps(struct ltr501_data *data)
static const struct iio_chan_spec ltr501_channels[] = {
LTR501_INTENSITY_CHANNEL(0, LTR501_ALS_DATA0, IIO_MOD_LIGHT_BOTH, 0),
LTR501_INTENSITY_CHANNEL(1, LTR501_ALS_DATA1, IIO_MOD_LIGHT_IR,
- BIT(IIO_CHAN_INFO_SCALE)),
+ BIT(IIO_CHAN_INFO_SCALE)),
{
.type = IIO_PROXIMITY,
.address = LTR501_PS_DATA,
@@ -129,8 +130,8 @@ static const int ltr501_ps_gain[4][2] = {
};
static int ltr501_read_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int *val, int *val2, long mask)
+ struct iio_chan_spec const *chan,
+ int *val, int *val2, long mask)
{
struct ltr501_data *data = iio_priv(indio_dev);
__le16 buf[2];
@@ -149,7 +150,7 @@ static int ltr501_read_raw(struct iio_dev *indio_dev,
if (ret < 0)
return ret;
*val = le16_to_cpu(chan->address == LTR501_ALS_DATA1 ?
- buf[0] : buf[1]);
+ buf[0] : buf[1]);
return IIO_VAL_INT;
case IIO_PROXIMITY:
mutex_lock(&data->lock_ps);
@@ -199,8 +200,8 @@ static int ltr501_get_ps_gain_index(int val, int val2)
}
static int ltr501_write_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int val, int val2, long mask)
+ struct iio_chan_spec const *chan,
+ int val, int val2, long mask)
{
struct ltr501_data *data = iio_priv(indio_dev);
int i;
@@ -219,7 +220,8 @@ static int ltr501_write_raw(struct iio_dev *indio_dev,
else
return -EINVAL;
return i2c_smbus_write_byte_data(data->client,
- LTR501_ALS_CONTR, data->als_contr);
+ LTR501_ALS_CONTR,
+ data->als_contr);
case IIO_PROXIMITY:
i = ltr501_get_ps_gain_index(val, val2);
if (i < 0)
@@ -227,7 +229,8 @@ static int ltr501_write_raw(struct iio_dev *indio_dev,
data->ps_contr &= ~LTR501_CONTR_PS_GAIN_MASK;
data->ps_contr |= i << LTR501_CONTR_PS_GAIN_SHIFT;
return i2c_smbus_write_byte_data(data->client,
- LTR501_PS_CONTR, data->ps_contr);
+ LTR501_PS_CONTR,
+ data->ps_contr);
default:
return -EINVAL;
}
@@ -279,7 +282,7 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
/* figure out which data needs to be ready */
if (test_bit(0, indio_dev->active_scan_mask) ||
- test_bit(1, indio_dev->active_scan_mask))
+ test_bit(1, indio_dev->active_scan_mask))
mask |= LTR501_STATUS_ALS_RDY;
if (test_bit(2, indio_dev->active_scan_mask))
mask |= LTR501_STATUS_PS_RDY;
@@ -290,7 +293,9 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
if (mask & LTR501_STATUS_ALS_RDY) {
ret = i2c_smbus_read_i2c_block_data(data->client,
- LTR501_ALS_DATA1, sizeof(als_buf), (u8 *) als_buf);
+ LTR501_ALS_DATA1,
+ sizeof(als_buf),
+ (u8 *)als_buf);
if (ret < 0)
return ret;
if (test_bit(0, indio_dev->active_scan_mask))
@@ -306,8 +311,7 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
buf[j++] = ret & LTR501_PS_DATA_MASK;
}
- iio_push_to_buffers_with_timestamp(indio_dev, buf,
- iio_get_time_ns());
+ iio_push_to_buffers_with_timestamp(indio_dev, buf, iio_get_time_ns());
done:
iio_trigger_notify_done(indio_dev->trig);
@@ -330,7 +334,7 @@ static int ltr501_init(struct ltr501_data *data)
data->ps_contr = ret | LTR501_CONTR_ACTIVE;
return ltr501_write_contr(data->client, data->als_contr,
- data->ps_contr);
+ data->ps_contr);
}
static int ltr501_powerdown(struct ltr501_data *data)
@@ -341,7 +345,7 @@ static int ltr501_powerdown(struct ltr501_data *data)
}
static int ltr501_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+ const struct i2c_device_id *id)
{
struct ltr501_data *data;
struct iio_dev *indio_dev;
@@ -375,7 +379,7 @@ static int ltr501_probe(struct i2c_client *client,
return ret;
ret = iio_triggered_buffer_setup(indio_dev, NULL,
- ltr501_trigger_handler, NULL);
+ ltr501_trigger_handler, NULL);
if (ret)
goto powerdown_on_error;
@@ -407,14 +411,14 @@ static int ltr501_remove(struct i2c_client *client)
static int ltr501_suspend(struct device *dev)
{
struct ltr501_data *data = iio_priv(i2c_get_clientdata(
- to_i2c_client(dev)));
+ to_i2c_client(dev)));
return ltr501_powerdown(data);
}
static int ltr501_resume(struct device *dev)
{
struct ltr501_data *data = iio_priv(i2c_get_clientdata(
- to_i2c_client(dev)));
+ to_i2c_client(dev)));
return ltr501_write_contr(data->client, data->als_contr,
data->ps_contr);
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] iio: light: ltr501: Fix alignment to match open parenthesis
2015-04-09 14:17 [PATCH] iio: light: ltr501: Fix alignment to match open parenthesis Daniel Baluta
@ 2015-04-09 14:51 ` Kuppuswamy, Sathyanarayanan
2015-04-09 15:01 ` Daniel Baluta
0 siblings, 1 reply; 4+ messages in thread
From: Kuppuswamy, Sathyanarayanan @ 2015-04-09 14:51 UTC (permalink / raw)
To: Baluta, Daniel, jic23@kernel.org
Cc: knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Hi Daniel,
You have asked me to include this patch in my LTR501 patch set. I have already sent few versions of my patch set with your patch. Do you want to submit it again separately?
--
Sathyanarayanan KN
-----Original Message-----
From: Baluta, Daniel
Sent: Thursday, April 09, 2015 7:18 AM
To: jic23@kernel.org
Cc: knaack.h@gmx.de; lars@metafoo.de; pmeerw@pmeerw.net; Baluta, Daniel; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org; Kuppuswamy, Sathyanarayanan
Subject: [PATCH] iio: light: ltr501: Fix alignment to match open parenthesis
This makes ltr501 code consistent with the coding style adopted for the new drivers added to IIO.
We prepare the path for adding support for LTR559 chip.
Reported by checkpatch.pl
Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
---
Changes since v1:
* rebased on top of 1ca510b0ea6 ("iio: light: ltr501: Powerdown device on error")
* separated from path series related to LTR559 support because there are still things
to do there: http://marc.info/?l=linux-kernel&m=142779827617036&w=2
drivers/iio/light/ltr501.c | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c index 78b8783..f208c98 100644
--- a/drivers/iio/light/ltr501.c
+++ b/drivers/iio/light/ltr501.c
@@ -58,7 +58,7 @@ static int ltr501_drdy(struct ltr501_data *data, u8 drdy_mask)
while (tries--) {
ret = i2c_smbus_read_byte_data(data->client,
- LTR501_ALS_PS_STATUS);
+ LTR501_ALS_PS_STATUS);
if (ret < 0)
return ret;
if ((ret & drdy_mask) == drdy_mask)
@@ -77,7 +77,8 @@ static int ltr501_read_als(struct ltr501_data *data, __le16 buf[2])
return ret;
/* always read both ALS channels in given order */
return i2c_smbus_read_i2c_block_data(data->client,
- LTR501_ALS_DATA1, 2 * sizeof(__le16), (u8 *) buf);
+ LTR501_ALS_DATA1,
+ 2 * sizeof(__le16), (u8 *)buf);
}
static int ltr501_read_ps(struct ltr501_data *data) @@ -107,7 +108,7 @@ static int ltr501_read_ps(struct ltr501_data *data) static const struct iio_chan_spec ltr501_channels[] = {
LTR501_INTENSITY_CHANNEL(0, LTR501_ALS_DATA0, IIO_MOD_LIGHT_BOTH, 0),
LTR501_INTENSITY_CHANNEL(1, LTR501_ALS_DATA1, IIO_MOD_LIGHT_IR,
- BIT(IIO_CHAN_INFO_SCALE)),
+ BIT(IIO_CHAN_INFO_SCALE)),
{
.type = IIO_PROXIMITY,
.address = LTR501_PS_DATA,
@@ -129,8 +130,8 @@ static const int ltr501_ps_gain[4][2] = { };
static int ltr501_read_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int *val, int *val2, long mask)
+ struct iio_chan_spec const *chan,
+ int *val, int *val2, long mask)
{
struct ltr501_data *data = iio_priv(indio_dev);
__le16 buf[2];
@@ -149,7 +150,7 @@ static int ltr501_read_raw(struct iio_dev *indio_dev,
if (ret < 0)
return ret;
*val = le16_to_cpu(chan->address == LTR501_ALS_DATA1 ?
- buf[0] : buf[1]);
+ buf[0] : buf[1]);
return IIO_VAL_INT;
case IIO_PROXIMITY:
mutex_lock(&data->lock_ps);
@@ -199,8 +200,8 @@ static int ltr501_get_ps_gain_index(int val, int val2) }
static int ltr501_write_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int val, int val2, long mask)
+ struct iio_chan_spec const *chan,
+ int val, int val2, long mask)
{
struct ltr501_data *data = iio_priv(indio_dev);
int i;
@@ -219,7 +220,8 @@ static int ltr501_write_raw(struct iio_dev *indio_dev,
else
return -EINVAL;
return i2c_smbus_write_byte_data(data->client,
- LTR501_ALS_CONTR, data->als_contr);
+ LTR501_ALS_CONTR,
+ data->als_contr);
case IIO_PROXIMITY:
i = ltr501_get_ps_gain_index(val, val2);
if (i < 0)
@@ -227,7 +229,8 @@ static int ltr501_write_raw(struct iio_dev *indio_dev,
data->ps_contr &= ~LTR501_CONTR_PS_GAIN_MASK;
data->ps_contr |= i << LTR501_CONTR_PS_GAIN_SHIFT;
return i2c_smbus_write_byte_data(data->client,
- LTR501_PS_CONTR, data->ps_contr);
+ LTR501_PS_CONTR,
+ data->ps_contr);
default:
return -EINVAL;
}
@@ -279,7 +282,7 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
/* figure out which data needs to be ready */
if (test_bit(0, indio_dev->active_scan_mask) ||
- test_bit(1, indio_dev->active_scan_mask))
+ test_bit(1, indio_dev->active_scan_mask))
mask |= LTR501_STATUS_ALS_RDY;
if (test_bit(2, indio_dev->active_scan_mask))
mask |= LTR501_STATUS_PS_RDY;
@@ -290,7 +293,9 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
if (mask & LTR501_STATUS_ALS_RDY) {
ret = i2c_smbus_read_i2c_block_data(data->client,
- LTR501_ALS_DATA1, sizeof(als_buf), (u8 *) als_buf);
+ LTR501_ALS_DATA1,
+ sizeof(als_buf),
+ (u8 *)als_buf);
if (ret < 0)
return ret;
if (test_bit(0, indio_dev->active_scan_mask)) @@ -306,8 +311,7 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
buf[j++] = ret & LTR501_PS_DATA_MASK;
}
- iio_push_to_buffers_with_timestamp(indio_dev, buf,
- iio_get_time_ns());
+ iio_push_to_buffers_with_timestamp(indio_dev, buf, iio_get_time_ns());
done:
iio_trigger_notify_done(indio_dev->trig);
@@ -330,7 +334,7 @@ static int ltr501_init(struct ltr501_data *data)
data->ps_contr = ret | LTR501_CONTR_ACTIVE;
return ltr501_write_contr(data->client, data->als_contr,
- data->ps_contr);
+ data->ps_contr);
}
static int ltr501_powerdown(struct ltr501_data *data) @@ -341,7 +345,7 @@ static int ltr501_powerdown(struct ltr501_data *data) }
static int ltr501_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+ const struct i2c_device_id *id)
{
struct ltr501_data *data;
struct iio_dev *indio_dev;
@@ -375,7 +379,7 @@ static int ltr501_probe(struct i2c_client *client,
return ret;
ret = iio_triggered_buffer_setup(indio_dev, NULL,
- ltr501_trigger_handler, NULL);
+ ltr501_trigger_handler, NULL);
if (ret)
goto powerdown_on_error;
@@ -407,14 +411,14 @@ static int ltr501_remove(struct i2c_client *client) static int ltr501_suspend(struct device *dev) {
struct ltr501_data *data = iio_priv(i2c_get_clientdata(
- to_i2c_client(dev)));
+ to_i2c_client(dev)));
return ltr501_powerdown(data);
}
static int ltr501_resume(struct device *dev) {
struct ltr501_data *data = iio_priv(i2c_get_clientdata(
- to_i2c_client(dev)));
+ to_i2c_client(dev)));
return ltr501_write_contr(data->client, data->als_contr,
data->ps_contr);
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iio: light: ltr501: Fix alignment to match open parenthesis
2015-04-09 14:51 ` Kuppuswamy, Sathyanarayanan
@ 2015-04-09 15:01 ` Daniel Baluta
2015-04-09 16:10 ` Jonathan Cameron
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Baluta @ 2015-04-09 15:01 UTC (permalink / raw)
To: Kuppuswamy, Sathyanarayanan
Cc: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de,
pmeerw@pmeerw.net, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
On 04/09/2015 05:51 PM, Kuppuswamy, Sathyanarayanan wrote:
> Hi Daniel,
>
> You have asked me to include this patch in my LTR501 patch set. I have already sent few versions of my patch set with your patch. Do you want to submit it again separately?
Hi Sathya,
After Jonathan's comments on patch series titled:
"[PATCH v3 0/6] Added LTR501 Interrupt support"
you will still need to send another version.
I think the best way to synchronize on this is for Jonathan to take this
current patch as I've rebased it on the tip of iio/testing.
thanks,
Daniel.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iio: light: ltr501: Fix alignment to match open parenthesis
2015-04-09 15:01 ` Daniel Baluta
@ 2015-04-09 16:10 ` Jonathan Cameron
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2015-04-09 16:10 UTC (permalink / raw)
To: Daniel Baluta, Kuppuswamy, Sathyanarayanan
Cc: knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
On 09/04/15 16:01, Daniel Baluta wrote:
>
>
> On 04/09/2015 05:51 PM, Kuppuswamy, Sathyanarayanan wrote:
>> Hi Daniel,
>>
>> You have asked me to include this patch in my LTR501 patch set. I have already sent few versions of my patch set with your patch. Do you want to submit it again separately?
>
> Hi Sathya,
>
> After Jonathan's comments on patch series titled:
> "[PATCH v3 0/6] Added LTR501 Interrupt support"
>
> you will still need to send another version.
>
> I think the best way to synchronize on this is for Jonathan to take this current patch as I've rebased it on the tip of iio/testing.
Yup, I've just applied this one as well to the same branch.
Sorry, wasn't being that observant earlier and didn't register this one was in the other series as well.
Jonathan
>
> thanks,
> Daniel.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-09 16:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-09 14:17 [PATCH] iio: light: ltr501: Fix alignment to match open parenthesis Daniel Baluta
2015-04-09 14:51 ` Kuppuswamy, Sathyanarayanan
2015-04-09 15:01 ` Daniel Baluta
2015-04-09 16:10 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox