On 10/10/16 08:19, Brian Masney wrote:
> isl29035_detect() did not do chip detection. Move functionality directly
> into isl29018_chip_init() to avoid naming confusion.
It kind of does do detection (or at least verification). Key point is that
it does other things as well.

I added the word 'just' to the description when applying.

Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan
> 
> Signed-off-by: Brian Masney <masn...@onstation.org>
> ---
>  drivers/staging/iio/light/isl29018.c | 44 
> ++++++++++++++++--------------------
>  1 file changed, 19 insertions(+), 25 deletions(-)
> 
> diff --git a/drivers/staging/iio/light/isl29018.c 
> b/drivers/staging/iio/light/isl29018.c
> index 26bbbb8..130f222 100644
> --- a/drivers/staging/iio/light/isl29018.c
> +++ b/drivers/staging/iio/light/isl29018.c
> @@ -529,30 +529,6 @@ static const struct attribute_group isl29023_group = {
>       .attrs = isl29023_attributes,
>  };
>  
> -static int isl29035_detect(struct isl29018_chip *chip)
> -{
> -     int status;
> -     unsigned int id;
> -     struct device *dev = regmap_get_device(chip->regmap);
> -
> -     status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
> -     if (status < 0) {
> -             dev_err(dev,
> -                     "Error reading ID register with error %d\n",
> -                     status);
> -             return status;
> -     }
> -
> -     id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
> -
> -     if (id != ISL29035_DEVICE_ID)
> -             return -ENODEV;
> -
> -     /* Clear brownout bit */
> -     return regmap_update_bits(chip->regmap, ISL29035_REG_DEVICE_ID,
> -                               ISL29035_BOUT_MASK, 0);
> -}
> -
>  enum {
>       isl29018,
>       isl29023,
> @@ -565,7 +541,25 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
>       struct device *dev = regmap_get_device(chip->regmap);
>  
>       if (chip->type == isl29035) {
> -             status = isl29035_detect(chip);
> +             unsigned int id;
> +
> +             status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
> +             if (status < 0) {
> +                     dev_err(dev,
> +                             "Error reading ID register with error %d\n",
> +                             status);
> +                     return status;
> +             }
> +
> +             id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
> +
> +             if (id != ISL29035_DEVICE_ID)
> +                     return -ENODEV;
> +
> +             /* Clear brownout bit */
> +             status = regmap_update_bits(chip->regmap,
> +                                         ISL29035_REG_DEVICE_ID,
> +                                         ISL29035_BOUT_MASK, 0);
>               if (status < 0)
>                       return status;
>       }
> 

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

Reply via email to