Skip to content

Commit a474d5c

Browse files
andy-shevjic23
authored andcommitted
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>
1 parent dbb1f2f commit a474d5c

1 file changed

Lines changed: 23 additions & 23 deletions

File tree

drivers/iio/magnetometer/ak8975.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ static irqreturn_t ak8975_irq_handler(int irq, void *data)
572572
static int ak8975_setup_irq(struct ak8975_data *data)
573573
{
574574
struct i2c_client *client = data->client;
575-
int rc;
576575
int irq;
576+
int ret;
577577

578578
init_waitqueue_head(&data->data_ready_queue);
579579
clear_bit(0, &data->flags);
@@ -582,15 +582,15 @@ static int ak8975_setup_irq(struct ak8975_data *data)
582582
else
583583
irq = gpiod_to_irq(data->eoc_gpiod);
584584

585-
rc = devm_request_irq(&client->dev, irq, ak8975_irq_handler,
586-
IRQF_TRIGGER_RISING,
587-
dev_name(&client->dev), data);
588-
if (rc < 0)
589-
return rc;
585+
ret = devm_request_irq(&client->dev, irq, ak8975_irq_handler,
586+
IRQF_TRIGGER_RISING,
587+
dev_name(&client->dev), data);
588+
if (ret)
589+
return ret;
590590

591591
data->eoc_irq = irq;
592592

593-
return rc;
593+
return 0;
594594
}
595595

596596
/*
@@ -908,8 +908,8 @@ static int ak8975_probe(struct i2c_client *client)
908908
struct iio_dev *indio_dev;
909909
struct gpio_desc *eoc_gpiod;
910910
struct gpio_desc *reset_gpiod;
911-
int err;
912911
const char *name = NULL;
912+
int ret;
913913

914914
/*
915915
* Grab and set up the supplied GPIO.
@@ -944,9 +944,9 @@ static int ak8975_probe(struct i2c_client *client)
944944
data->reset_gpiod = reset_gpiod;
945945
data->eoc_irq = 0;
946946

947-
err = iio_read_mount_matrix(&client->dev, &data->orientation);
948-
if (err)
949-
return err;
947+
ret = iio_read_mount_matrix(&client->dev, &data->orientation);
948+
if (ret)
949+
return ret;
950950

951951
/* id will be NULL when enumerated via ACPI */
952952
data->def = i2c_get_match_data(client);
@@ -967,20 +967,20 @@ static int ak8975_probe(struct i2c_client *client)
967967
if (IS_ERR(data->vid))
968968
return PTR_ERR(data->vid);
969969

970-
err = ak8975_power_on(data);
971-
if (err)
972-
return err;
970+
ret = ak8975_power_on(data);
971+
if (ret)
972+
return ret;
973973

974-
err = ak8975_who_i_am(client, data->def->type);
975-
if (err < 0) {
974+
ret = ak8975_who_i_am(client, data->def->type);
975+
if (ret) {
976976
dev_err(&client->dev, "Unexpected device\n");
977977
goto power_off;
978978
}
979979
dev_dbg(&client->dev, "Asahi compass chip %s\n", name);
980980

981981
/* Perform some basic start-of-day setup of the device. */
982-
err = ak8975_setup(client);
983-
if (err < 0) {
982+
ret = ak8975_setup(client);
983+
if (ret) {
984984
dev_err(&client->dev, "%s initialization fails\n", name);
985985
goto power_off;
986986
}
@@ -993,15 +993,15 @@ static int ak8975_probe(struct i2c_client *client)
993993
indio_dev->modes = INDIO_DIRECT_MODE;
994994
indio_dev->name = name;
995995

996-
err = iio_triggered_buffer_setup(indio_dev, NULL, ak8975_handle_trigger,
996+
ret = iio_triggered_buffer_setup(indio_dev, NULL, ak8975_handle_trigger,
997997
NULL);
998-
if (err) {
998+
if (ret) {
999999
dev_err(&client->dev, "triggered buffer setup failed\n");
10001000
goto power_off;
10011001
}
10021002

1003-
err = iio_device_register(indio_dev);
1004-
if (err) {
1003+
ret = iio_device_register(indio_dev);
1004+
if (ret) {
10051005
dev_err(&client->dev, "device register failed\n");
10061006
goto cleanup_buffer;
10071007
}
@@ -1024,7 +1024,7 @@ static int ak8975_probe(struct i2c_client *client)
10241024
iio_triggered_buffer_cleanup(indio_dev);
10251025
power_off:
10261026
ak8975_power_off(data);
1027-
return err;
1027+
return ret;
10281028
}
10291029

10301030
static void ak8975_remove(struct i2c_client *client)

0 commit comments

Comments
 (0)