iio: magnetometer: ak8975: unify return code variable name

In one case 'rc' is used in the other 'err', the most use 'ret'.
Make the latter use the former, id est 'ret'.

While at it, drop unneeded ' < 0' checks.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index d51028b447f656a5115fec45b08d95e7fc64526b..6be72e1cc0a8321e767da5e65d54c0fe88712304 100644 (file)
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -572,8 +572,8 @@ static irqreturn_t ak8975_irq_handler(int irq, void *data)
 static int ak8975_setup_irq(struct ak8975_data *data)
 {
        struct i2c_client *client = data->client;
-       int rc;
        int irq;
+       int ret;
 
        init_waitqueue_head(&data->data_ready_queue);
        clear_bit(0, &data->flags);
@@ -582,15 +582,15 @@ static int ak8975_setup_irq(struct ak8975_data *data)
        else
                irq = gpiod_to_irq(data->eoc_gpiod);
 
-       rc = devm_request_irq(&client->dev, irq, ak8975_irq_handler,
-                             IRQF_TRIGGER_RISING,
-                             dev_name(&client->dev), data);
-       if (rc < 0)
-               return rc;
+       ret = devm_request_irq(&client->dev, irq, ak8975_irq_handler,
+                              IRQF_TRIGGER_RISING,
+                              dev_name(&client->dev), data);
+       if (ret)
+               return ret;
 
        data->eoc_irq = irq;
 
-       return rc;
+       return 0;
 }
 
 /*
@@ -908,8 +908,8 @@ static int ak8975_probe(struct i2c_client *client)
        struct iio_dev *indio_dev;
        struct gpio_desc *eoc_gpiod;
        struct gpio_desc *reset_gpiod;
-       int err;
        const char *name = NULL;
+       int ret;
 
        /*
         * Grab and set up the supplied GPIO.
@@ -944,9 +944,9 @@ static int ak8975_probe(struct i2c_client *client)
        data->reset_gpiod = reset_gpiod;
        data->eoc_irq = 0;
 
-       err = iio_read_mount_matrix(&client->dev, &data->orientation);
-       if (err)
-               return err;
+       ret = iio_read_mount_matrix(&client->dev, &data->orientation);
+       if (ret)
+               return ret;
 
        /* id will be NULL when enumerated via ACPI */
        data->def = i2c_get_match_data(client);
@@ -967,20 +967,20 @@ static int ak8975_probe(struct i2c_client *client)
        if (IS_ERR(data->vid))
                return PTR_ERR(data->vid);
 
-       err = ak8975_power_on(data);
-       if (err)
-               return err;
+       ret = ak8975_power_on(data);
+       if (ret)
+               return ret;
 
-       err = ak8975_who_i_am(client, data->def->type);
-       if (err < 0) {
+       ret = ak8975_who_i_am(client, data->def->type);
+       if (ret) {
                dev_err(&client->dev, "Unexpected device\n");
                goto power_off;
        }
        dev_dbg(&client->dev, "Asahi compass chip %s\n", name);
 
        /* Perform some basic start-of-day setup of the device. */
-       err = ak8975_setup(client);
-       if (err < 0) {
+       ret = ak8975_setup(client);
+       if (ret) {
                dev_err(&client->dev, "%s initialization fails\n", name);
                goto power_off;
        }
@@ -993,15 +993,15 @@ static int ak8975_probe(struct i2c_client *client)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->name = name;
 
-       err = iio_triggered_buffer_setup(indio_dev, NULL, ak8975_handle_trigger,
+       ret = iio_triggered_buffer_setup(indio_dev, NULL, ak8975_handle_trigger,
                                         NULL);
-       if (err) {
+       if (ret) {
                dev_err(&client->dev, "triggered buffer setup failed\n");
                goto power_off;
        }
 
-       err = iio_device_register(indio_dev);
-       if (err) {
+       ret = iio_device_register(indio_dev);
+       if (ret) {
                dev_err(&client->dev, "device register failed\n");
                goto cleanup_buffer;
        }
@@ -1024,7 +1024,7 @@ cleanup_buffer:
        iio_triggered_buffer_cleanup(indio_dev);
 power_off:
        ak8975_power_off(data);
-       return err;
+       return ret;
 }
 
 static void ak8975_remove(struct i2c_client *client)