Commit 6212e1d6 authored by Wolfram Sang's avatar Wolfram Sang

gpio: pca953x: variable 'id' was used twice

sparse  rightfully said:

drivers/gpio/gpio-pca953x.c:771:45: warning: symbol 'id' shadows an earlier one
drivers/gpio/gpio-pca953x.c:742:36: originally declared here

So, name them explicitly 'i2c_id' and 'acpi_id' to avoid any confusion.
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 31158763
...@@ -739,7 +739,7 @@ static int device_pca957x_init(struct pca953x_chip *chip, u32 invert) ...@@ -739,7 +739,7 @@ static int device_pca957x_init(struct pca953x_chip *chip, u32 invert)
static const struct of_device_id pca953x_dt_ids[]; static const struct of_device_id pca953x_dt_ids[];
static int pca953x_probe(struct i2c_client *client, static int pca953x_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *i2c_id)
{ {
struct pca953x_platform_data *pdata; struct pca953x_platform_data *pdata;
struct pca953x_chip *chip; struct pca953x_chip *chip;
...@@ -765,21 +765,21 @@ static int pca953x_probe(struct i2c_client *client, ...@@ -765,21 +765,21 @@ static int pca953x_probe(struct i2c_client *client,
chip->client = client; chip->client = client;
if (id) { if (i2c_id) {
chip->driver_data = id->driver_data; chip->driver_data = i2c_id->driver_data;
} else { } else {
const struct acpi_device_id *id; const struct acpi_device_id *acpi_id;
const struct of_device_id *match; const struct of_device_id *match;
match = of_match_device(pca953x_dt_ids, &client->dev); match = of_match_device(pca953x_dt_ids, &client->dev);
if (match) { if (match) {
chip->driver_data = (int)(uintptr_t)match->data; chip->driver_data = (int)(uintptr_t)match->data;
} else { } else {
id = acpi_match_device(pca953x_acpi_ids, &client->dev); acpi_id = acpi_match_device(pca953x_acpi_ids, &client->dev);
if (!id) if (!acpi_id)
return -ENODEV; return -ENODEV;
chip->driver_data = id->driver_data; chip->driver_data = acpi_id->driver_data;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment