Skip to content

Commit

Permalink
gpio: pcf857x: Remove pdata argument to pcf857x_irq_domain_init()
Browse files Browse the repository at this point in the history
The argument is not used, remove it. No board registers a pcf857x device
with an IRQ without specifying platform data, IRQ domain registration
behaviour is thus not affected by this change.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Laurent Pinchart authored and Linus Walleij committed Aug 23, 2013
1 parent c990d6c commit 655c4e7
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/gpio/gpio-pcf857x.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ static void pcf857x_irq_domain_cleanup(struct pcf857x *gpio)
}

static int pcf857x_irq_domain_init(struct pcf857x *gpio,
struct pcf857x_platform_data *pdata,
struct i2c_client *client)
{
int status;
Expand Down Expand Up @@ -286,8 +285,8 @@ static int pcf857x_probe(struct i2c_client *client,
gpio->chip.ngpio = id->driver_data;

/* enable gpio_to_irq() if platform has settings */
if (pdata && client->irq) {
status = pcf857x_irq_domain_init(gpio, pdata, client);
if (client->irq) {
status = pcf857x_irq_domain_init(gpio, client);
if (status < 0) {
dev_err(&client->dev, "irq_domain init failed\n");
goto fail;
Expand Down Expand Up @@ -388,7 +387,7 @@ static int pcf857x_probe(struct i2c_client *client,
dev_dbg(&client->dev, "probe error %d for '%s'\n",
status, client->name);

if (pdata && client->irq)
if (client->irq)
pcf857x_irq_domain_cleanup(gpio);

return status;
Expand All @@ -411,7 +410,7 @@ static int pcf857x_remove(struct i2c_client *client)
}
}

if (pdata && client->irq)
if (client->irq)
pcf857x_irq_domain_cleanup(gpio);

status = gpiochip_remove(&gpio->chip);
Expand Down

0 comments on commit 655c4e7

Please sign in to comment.