[PATCH 1/4] iio: light: Add a blank line after declarations

[Daniel Baluta]

On Fri, Dec 12, 2014 at 4:31 PM, Roberta Dobrescu
<roberta.dobrescu at gmail.com> wrote:
> This patch fixes the following checkpatch.pl warning:
> WARNING: Missing a blank line after declarations
>
> While at it, it removes useless blank lines between declarations.
>
> Signed-off-by: Roberta Dobrescu <roberta.dobrescu at gmail.com>
> ---
>  drivers/iio/light/adjd_s311.c | 4 ++--
>  drivers/iio/light/ltr501.c    | 3 +++
>  drivers/iio/light/tcs3472.c   | 2 +-
>  drivers/iio/light/tsl4531.c   | 1 +
>  4 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
> index 09ad5f1..1fab65c 100644
> --- a/drivers/iio/light/adjd_s311.c
> +++ b/drivers/iio/light/adjd_s311.c
> @@ -99,8 +99,8 @@ static int adjd_s311_req_data(struct iio_dev *indio_dev)
>  static int adjd_s311_read_data(struct iio_dev *indio_dev, u8 reg, int *val)
>  {
>         struct adjd_s311_data *data = iio_priv(indio_dev);
> -
>         int ret = adjd_s311_req_data(indio_dev);
> +
>         if (ret < 0)
>                 return ret;

I'm not sure about this. I would definitely prefer checking the
return code immediately after the function call.

Better, would be something like this:

diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index 09ad5f1..5860b66 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -99,8 +99,9 @@ static int adjd_s311_req_data(struct iio_dev *indio_dev)
 static int adjd_s311_read_data(struct iio_dev *indio_dev, u8 reg, int *val)
 {
        struct adjd_s311_data *data = iio_priv(indio_dev);
+       int ret;

-       int ret = adjd_s311_req_data(indio_dev);
+       ret = adjd_s311_req_data(indio_dev);
        if (ret < 0)
                return ret;

Adding Joe for comments.

>
> @@ -120,8 +120,8 @@ static irqreturn_t adjd_s311_trigger_handler(int irq, void *p)
>         struct adjd_s311_data *data = iio_priv(indio_dev);
>         s64 time_ns = iio_get_time_ns();
>         int i, j = 0;
> -
>         int ret = adjd_s311_req_data(indio_dev);
> +
>         if (ret < 0)
>                 goto done;
>
> diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c
> index 62b7072..143277f 100644
> --- a/drivers/iio/light/ltr501.c
> +++ b/drivers/iio/light/ltr501.c
> @@ -73,6 +73,7 @@ static int ltr501_drdy(struct ltr501_data *data, u8 drdy_mask)
>  static int ltr501_read_als(struct ltr501_data *data, __le16 buf[2])
>  {
>         int ret = ltr501_drdy(data, LTR501_STATUS_ALS_RDY);
> +
>         if (ret < 0)
>                 return ret;
>         /* always read both ALS channels in given order */
> @@ -83,6 +84,7 @@ static int ltr501_read_als(struct ltr501_data *data, __le16 buf[2])
>  static int ltr501_read_ps(struct ltr501_data *data)
>  {
>         int ret = ltr501_drdy(data, LTR501_STATUS_PS_RDY);
> +
>         if (ret < 0)
>                 return ret;
>         return i2c_smbus_read_word_data(data->client, LTR501_PS_DATA);
> @@ -258,6 +260,7 @@ static const struct iio_info ltr501_info = {
>  static int ltr501_write_contr(struct i2c_client *client, u8 als_val, u8 ps_val)
>  {
>         int ret = i2c_smbus_write_byte_data(client, LTR501_ALS_CONTR, als_val);
> +
>         if (ret < 0)
>                 return ret;
>
> diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c
> index 7525699..0946198 100644
> --- a/drivers/iio/light/tcs3472.c
> +++ b/drivers/iio/light/tcs3472.c
> @@ -188,8 +188,8 @@ static irqreturn_t tcs3472_trigger_handler(int irq, void *p)
>         struct iio_dev *indio_dev = pf->indio_dev;
>         struct tcs3472_data *data = iio_priv(indio_dev);
>         int i, j = 0;
> -
>         int ret = tcs3472_req_data(data);
> +
>         if (ret < 0)
>                 goto done;
>
> diff --git a/drivers/iio/light/tsl4531.c b/drivers/iio/light/tsl4531.c
> index 0763b86..50edbf0 100644
> --- a/drivers/iio/light/tsl4531.c
> +++ b/drivers/iio/light/tsl4531.c
> @@ -150,6 +150,7 @@ static const struct iio_info tsl4531_info = {
>  static int tsl4531_check_id(struct i2c_client *client)
>  {
>         int ret = i2c_smbus_read_byte_data(client, TSL4531_ID);
> +
>         if (ret < 0)
>                 return ret;

Thanks Roberta!

Daniel.