Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: remove all usage of gpio_remove ret val in driver/pinctl

Signed-off-by: abdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

abdoulaye berthe and committed by
Linus Walleij
b4e7c55d 144ef626

+20 -55
+4 -5
drivers/pinctrl/pinctrl-adi2.c
··· 949 949 struct gpio_port *port; 950 950 char pinctrl_devname[DEVNAME_SIZE]; 951 951 static int gpio; 952 - int ret = 0, ret1; 952 + int ret = 0; 953 953 954 954 pdata = dev->platform_data; 955 955 if (!pdata) ··· 1027 1027 return 0; 1028 1028 1029 1029 out_remove_gpiochip: 1030 - ret1 = gpiochip_remove(&port->chip); 1030 + gpiochip_remove(&port->chip); 1031 1031 out_remove_domain: 1032 1032 if (port->pint) 1033 1033 irq_domain_remove(port->domain); ··· 1038 1038 static int adi_gpio_remove(struct platform_device *pdev) 1039 1039 { 1040 1040 struct gpio_port *port = platform_get_drvdata(pdev); 1041 - int ret; 1042 1041 u8 offset; 1043 1042 1044 1043 list_del(&port->node); 1045 1044 gpiochip_remove_pin_ranges(&port->chip); 1046 - ret = gpiochip_remove(&port->chip); 1045 + gpiochip_remove(&port->chip); 1047 1046 if (port->pint) { 1048 1047 for (offset = 0; offset < port->width; offset++) 1049 1048 irq_dispose_mapping(irq_find_mapping(port->domain, ··· 1050 1051 irq_domain_remove(port->domain); 1051 1052 } 1052 1053 1053 - return ret; 1054 + return 0; 1054 1055 } 1055 1056 1056 1057 static int adi_pinctrl_probe(struct platform_device *pdev)
+2 -9
drivers/pinctrl/pinctrl-as3722.c
··· 565 565 { 566 566 struct as3722_pctrl_info *as_pci; 567 567 int ret; 568 - int tret; 569 568 570 569 as_pci = devm_kzalloc(&pdev->dev, sizeof(*as_pci), GFP_KERNEL); 571 570 if (!as_pci) ··· 610 611 return 0; 611 612 612 613 fail_range_add: 613 - tret = gpiochip_remove(&as_pci->gpio_chip); 614 - if (tret < 0) 615 - dev_warn(&pdev->dev, "Couldn't remove gpio chip, %d\n", tret); 616 - 614 + gpiochip_remove(&as_pci->gpio_chip); 617 615 fail_chip_add: 618 616 pinctrl_unregister(as_pci->pctl); 619 617 return ret; ··· 619 623 static int as3722_pinctrl_remove(struct platform_device *pdev) 620 624 { 621 625 struct as3722_pctrl_info *as_pci = platform_get_drvdata(pdev); 622 - int ret; 623 626 624 - ret = gpiochip_remove(&as_pci->gpio_chip); 625 - if (ret < 0) 626 - return ret; 627 + gpiochip_remove(&as_pci->gpio_chip); 627 628 pinctrl_unregister(as_pci->pctl); 628 629 return 0; 629 630 }
+1 -4
drivers/pinctrl/pinctrl-baytrail.c
··· 638 638 static int byt_gpio_remove(struct platform_device *pdev) 639 639 { 640 640 struct byt_gpio *vg = platform_get_drvdata(pdev); 641 - int err; 642 641 643 642 pm_runtime_disable(&pdev->dev); 644 - err = gpiochip_remove(&vg->chip); 645 - if (err) 646 - dev_warn(&pdev->dev, "failed to remove gpio_chip.\n"); 643 + gpiochip_remove(&vg->chip); 647 644 648 645 return 0; 649 646 }
+2 -8
drivers/pinctrl/pinctrl-coh901.c
··· 756 756 757 757 err_no_range: 758 758 err_no_irqchip: 759 - if (gpiochip_remove(&gpio->chip)) 760 - dev_err(&pdev->dev, "failed to remove gpio chip\n"); 759 + gpiochip_remove(&gpio->chip); 761 760 err_no_chip: 762 761 clk_disable_unprepare(gpio->clk); 763 762 dev_err(&pdev->dev, "module ERROR:%d\n", err); ··· 766 767 static int __exit u300_gpio_remove(struct platform_device *pdev) 767 768 { 768 769 struct u300_gpio *gpio = platform_get_drvdata(pdev); 769 - int err; 770 770 771 771 /* Turn off the GPIO block */ 772 772 writel(0x00000000U, gpio->base + U300_GPIO_CR); 773 773 774 - err = gpiochip_remove(&gpio->chip); 775 - if (err < 0) { 776 - dev_err(gpio->dev, "unable to remove gpiochip: %d\n", err); 777 - return err; 778 - } 774 + gpiochip_remove(&gpio->chip); 779 775 clk_disable_unprepare(gpio->clk); 780 776 return 0; 781 777 }
+4 -12
drivers/pinctrl/pinctrl-rockchip.c
··· 1492 1492 for (--i, --bank; i >= 0; --i, --bank) { 1493 1493 if (!bank->valid) 1494 1494 continue; 1495 - 1496 - if (gpiochip_remove(&bank->gpio_chip)) 1497 - dev_err(&pdev->dev, "gpio chip %s remove failed\n", 1498 - bank->gpio_chip.label); 1495 + gpiochip_remove(&bank->gpio_chip); 1499 1496 } 1500 1497 return ret; 1501 1498 } ··· 1502 1505 { 1503 1506 struct rockchip_pin_ctrl *ctrl = info->ctrl; 1504 1507 struct rockchip_pin_bank *bank = ctrl->pin_banks; 1505 - int ret = 0; 1506 1508 int i; 1507 1509 1508 - for (i = 0; !ret && i < ctrl->nr_banks; ++i, ++bank) { 1510 + for (i = 0; i < ctrl->nr_banks; ++i, ++bank) { 1509 1511 if (!bank->valid) 1510 1512 continue; 1511 - 1512 - ret = gpiochip_remove(&bank->gpio_chip); 1513 + gpiochip_remove(&bank->gpio_chip); 1513 1514 } 1514 1515 1515 - if (ret) 1516 - dev_err(&pdev->dev, "gpio chip remove failed\n"); 1517 - 1518 - return ret; 1516 + return 0; 1519 1517 } 1520 1518 1521 1519 static int rockchip_get_bank_data(struct rockchip_pin_bank *bank,
+3 -6
drivers/pinctrl/sh-pfc/gpio.c
··· 409 409 410 410 int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc) 411 411 { 412 - int err; 413 - int ret; 412 + gpiochip_remove(&pfc->gpio->gpio_chip); 413 + gpiochip_remove(&pfc->func->gpio_chip); 414 414 415 - ret = gpiochip_remove(&pfc->gpio->gpio_chip); 416 - err = gpiochip_remove(&pfc->func->gpio_chip); 417 - 418 - return ret < 0 ? ret : err; 415 + return 0; 419 416 }
+1 -2
drivers/pinctrl/spear/pinctrl-plgpio.c
··· 606 606 607 607 remove_gpiochip: 608 608 dev_info(&pdev->dev, "Remove gpiochip\n"); 609 - if (gpiochip_remove(&plgpio->chip)) 610 - dev_err(&pdev->dev, "unable to remove gpiochip\n"); 609 + gpiochip_remove(&plgpio->chip); 611 610 unprepare_clk: 612 611 if (!IS_ERR(plgpio->clk)) 613 612 clk_unprepare(plgpio->clk);
+1 -2
drivers/pinctrl/sunxi/pinctrl-sunxi.c
··· 983 983 clk_error: 984 984 clk_disable_unprepare(clk); 985 985 gpiochip_error: 986 - if (gpiochip_remove(pctl->chip)) 987 - dev_err(&pdev->dev, "failed to remove gpio chip\n"); 986 + gpiochip_remove(pctl->chip); 988 987 pinctrl_error: 989 988 pinctrl_unregister(pctl->pctl_dev); 990 989 return ret;
+2 -7
drivers/pinctrl/vt8500/pinctrl-wmt.c
··· 615 615 return 0; 616 616 617 617 fail_range: 618 - if (gpiochip_remove(&data->gpio_chip)) 619 - dev_err(&pdev->dev, "failed to remove gpio chip\n"); 618 + gpiochip_remove(&data->gpio_chip); 620 619 fail_gpio: 621 620 pinctrl_unregister(data->pctl_dev); 622 621 return err; ··· 624 625 int wmt_pinctrl_remove(struct platform_device *pdev) 625 626 { 626 627 struct wmt_pinctrl_data *data = platform_get_drvdata(pdev); 627 - int err; 628 628 629 - err = gpiochip_remove(&data->gpio_chip); 630 - if (err) 631 - dev_err(&pdev->dev, "failed to remove gpio chip\n"); 632 - 629 + gpiochip_remove(&data->gpio_chip); 633 630 pinctrl_unregister(data->pctl_dev); 634 631 635 632 return 0;