staging: iio: isl29028: combine isl29028_proxim_get() and isl29028_read_proxim()

isl29028_proxim_get() checks to see if the promixity needs to be
enabled on the chip and then calls isl29028_read_proxim(). There
are no other callers of isl29028_read_proxim(). The naming between
these two functions can be confusing so this patch combines the
two to avoid the confusion.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index 50a208f368ed88338d07c3fdaaa8195efa29623c..dcec32dc97654021960dc6e89e7b93e3fa3dd9e2 100644 (file)
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -201,6 +201,13 @@ static int isl29028_read_proxim(struct isl29028_chip *chip, int *prox)
        unsigned int data;
        int ret;
 
+       if (!chip->enable_prox) {
+               ret = isl29028_enable_proximity(chip, true);
+               if (ret < 0)
+                       return ret;
+               chip->enable_prox = true;
+       }
+
        ret = regmap_read(chip->regmap, ISL29028_REG_PROX_DATA, &data);
        if (ret < 0) {
                dev_err(dev, "Error in reading register %d, error %d\n",
@@ -211,19 +218,6 @@ static int isl29028_read_proxim(struct isl29028_chip *chip, int *prox)
        return 0;
 }
 
-static int isl29028_proxim_get(struct isl29028_chip *chip, int *prox_data)
-{
-       int ret;
-
-       if (!chip->enable_prox) {
-               ret = isl29028_enable_proximity(chip, true);
-               if (ret < 0)
-                       return ret;
-               chip->enable_prox = true;
-       }
-       return isl29028_read_proxim(chip, prox_data);
-}
-
 static int isl29028_als_get(struct isl29028_chip *chip, int *als_data)
 {
        struct device *dev = regmap_get_device(chip->regmap);
@@ -349,7 +343,7 @@ static int isl29028_read_raw(struct iio_dev *indio_dev,
                        ret = isl29028_ir_get(chip, val);
                        break;
                case IIO_PROXIMITY:
-                       ret = isl29028_proxim_get(chip, val);
+                       ret = isl29028_read_proxim(chip, val);
                        break;
                default:
                        break;