diff options
Diffstat (limited to 'drivers/gpio/gpio-stmpe.c')
-rw-r--r-- | drivers/gpio/gpio-stmpe.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c index ed90adbdb128..845025a57240 100644 --- a/drivers/gpio/gpio-stmpe.c +++ b/drivers/gpio/gpio-stmpe.c | |||
@@ -353,17 +353,11 @@ static int stmpe_gpio_remove(struct platform_device *pdev) | |||
353 | struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev); | 353 | struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev); |
354 | struct stmpe *stmpe = stmpe_gpio->stmpe; | 354 | struct stmpe *stmpe = stmpe_gpio->stmpe; |
355 | struct stmpe_gpio_platform_data *pdata = stmpe->pdata->gpio; | 355 | struct stmpe_gpio_platform_data *pdata = stmpe->pdata->gpio; |
356 | int ret; | ||
357 | 356 | ||
358 | if (pdata && pdata->remove) | 357 | if (pdata && pdata->remove) |
359 | pdata->remove(stmpe, stmpe_gpio->chip.base); | 358 | pdata->remove(stmpe, stmpe_gpio->chip.base); |
360 | 359 | ||
361 | ret = gpiochip_remove(&stmpe_gpio->chip); | 360 | gpiochip_remove(&stmpe_gpio->chip); |
362 | if (ret < 0) { | ||
363 | dev_err(stmpe_gpio->dev, | ||
364 | "unable to remove gpiochip: %d\n", ret); | ||
365 | return ret; | ||
366 | } | ||
367 | 361 | ||
368 | stmpe_disable(stmpe, STMPE_BLOCK_GPIO); | 362 | stmpe_disable(stmpe, STMPE_BLOCK_GPIO); |
369 | 363 | ||