aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpio/gpio-pcf857x.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 5fe06949a49f..9e61bb0719d0 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -223,7 +223,6 @@ static void pcf857x_irq_domain_cleanup(struct pcf857x *gpio)
223} 223}
224 224
225static int pcf857x_irq_domain_init(struct pcf857x *gpio, 225static int pcf857x_irq_domain_init(struct pcf857x *gpio,
226 struct pcf857x_platform_data *pdata,
227 struct i2c_client *client) 226 struct i2c_client *client)
228{ 227{
229 int status; 228 int status;
@@ -286,8 +285,8 @@ static int pcf857x_probe(struct i2c_client *client,
286 gpio->chip.ngpio = id->driver_data; 285 gpio->chip.ngpio = id->driver_data;
287 286
288 /* enable gpio_to_irq() if platform has settings */ 287 /* enable gpio_to_irq() if platform has settings */
289 if (pdata && client->irq) { 288 if (client->irq) {
290 status = pcf857x_irq_domain_init(gpio, pdata, client); 289 status = pcf857x_irq_domain_init(gpio, client);
291 if (status < 0) { 290 if (status < 0) {
292 dev_err(&client->dev, "irq_domain init failed\n"); 291 dev_err(&client->dev, "irq_domain init failed\n");
293 goto fail; 292 goto fail;
@@ -388,7 +387,7 @@ fail:
388 dev_dbg(&client->dev, "probe error %d for '%s'\n", 387 dev_dbg(&client->dev, "probe error %d for '%s'\n",
389 status, client->name); 388 status, client->name);
390 389
391 if (pdata && client->irq) 390 if (client->irq)
392 pcf857x_irq_domain_cleanup(gpio); 391 pcf857x_irq_domain_cleanup(gpio);
393 392
394 return status; 393 return status;
@@ -411,7 +410,7 @@ static int pcf857x_remove(struct i2c_client *client)
411 } 410 }
412 } 411 }
413 412
414 if (pdata && client->irq) 413 if (client->irq)
415 pcf857x_irq_domain_cleanup(gpio); 414 pcf857x_irq_domain_cleanup(gpio);
416 415
417 status = gpiochip_remove(&gpio->chip); 416 status = gpiochip_remove(&gpio->chip);