diff options
Diffstat (limited to 'drivers/gpio/gpio-f7188x.c')
-rw-r--r-- | drivers/gpio/gpio-f7188x.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c index 8f73ee093739..fd3202f968ff 100644 --- a/drivers/gpio/gpio-f7188x.c +++ b/drivers/gpio/gpio-f7188x.c | |||
@@ -317,13 +317,7 @@ static int f7188x_gpio_probe(struct platform_device *pdev) | |||
317 | err_gpiochip: | 317 | err_gpiochip: |
318 | for (i = i - 1; i >= 0; i--) { | 318 | for (i = i - 1; i >= 0; i--) { |
319 | struct f7188x_gpio_bank *bank = &data->bank[i]; | 319 | struct f7188x_gpio_bank *bank = &data->bank[i]; |
320 | int tmp; | 320 | gpiochip_remove(&bank->chip); |
321 | |||
322 | tmp = gpiochip_remove(&bank->chip); | ||
323 | if (tmp < 0) | ||
324 | dev_err(&pdev->dev, | ||
325 | "Failed to remove gpiochip %d: %d\n", | ||
326 | i, tmp); | ||
327 | } | 321 | } |
328 | 322 | ||
329 | return err; | 323 | return err; |
@@ -331,20 +325,12 @@ err_gpiochip: | |||
331 | 325 | ||
332 | static int f7188x_gpio_remove(struct platform_device *pdev) | 326 | static int f7188x_gpio_remove(struct platform_device *pdev) |
333 | { | 327 | { |
334 | int err; | ||
335 | int i; | 328 | int i; |
336 | struct f7188x_gpio_data *data = platform_get_drvdata(pdev); | 329 | struct f7188x_gpio_data *data = platform_get_drvdata(pdev); |
337 | 330 | ||
338 | for (i = 0; i < data->nr_bank; i++) { | 331 | for (i = 0; i < data->nr_bank; i++) { |
339 | struct f7188x_gpio_bank *bank = &data->bank[i]; | 332 | struct f7188x_gpio_bank *bank = &data->bank[i]; |
340 | 333 | gpiochip_remove(&bank->chip); | |
341 | err = gpiochip_remove(&bank->chip); | ||
342 | if (err) { | ||
343 | dev_err(&pdev->dev, | ||
344 | "Failed to remove GPIO gpiochip %d: %d\n", | ||
345 | i, err); | ||
346 | return err; | ||
347 | } | ||
348 | } | 334 | } |
349 | 335 | ||
350 | return 0; | 336 | return 0; |