···949949 struct gpio_port *port;950950 char pinctrl_devname[DEVNAME_SIZE];951951 static int gpio;952952- int ret = 0, ret1;952952+ int ret = 0;953953954954 pdata = dev->platform_data;955955 if (!pdata)···10271027 return 0;1028102810291029out_remove_gpiochip:10301030- ret1 = gpiochip_remove(&port->chip);10301030+ gpiochip_remove(&port->chip);10311031out_remove_domain:10321032 if (port->pint)10331033 irq_domain_remove(port->domain);···10381038static int adi_gpio_remove(struct platform_device *pdev)10391039{10401040 struct gpio_port *port = platform_get_drvdata(pdev);10411041- int ret;10421041 u8 offset;1043104210441043 list_del(&port->node);10451044 gpiochip_remove_pin_ranges(&port->chip);10461046- ret = gpiochip_remove(&port->chip);10451045+ gpiochip_remove(&port->chip);10471046 if (port->pint) {10481047 for (offset = 0; offset < port->width; offset++)10491048 irq_dispose_mapping(irq_find_mapping(port->domain,···10501051 irq_domain_remove(port->domain);10511052 }1052105310531053- return ret;10541054+ return 0;10541055}1055105610561057static int adi_pinctrl_probe(struct platform_device *pdev)
+2-9
drivers/pinctrl/pinctrl-as3722.c
···565565{566566 struct as3722_pctrl_info *as_pci;567567 int ret;568568- int tret;569568570569 as_pci = devm_kzalloc(&pdev->dev, sizeof(*as_pci), GFP_KERNEL);571570 if (!as_pci)···610611 return 0;611612612613fail_range_add:613613- tret = gpiochip_remove(&as_pci->gpio_chip);614614- if (tret < 0)615615- dev_warn(&pdev->dev, "Couldn't remove gpio chip, %d\n", tret);616616-614614+ gpiochip_remove(&as_pci->gpio_chip);617615fail_chip_add:618616 pinctrl_unregister(as_pci->pctl);619617 return ret;···619623static int as3722_pinctrl_remove(struct platform_device *pdev)620624{621625 struct as3722_pctrl_info *as_pci = platform_get_drvdata(pdev);622622- int ret;623626624624- ret = gpiochip_remove(&as_pci->gpio_chip);625625- if (ret < 0)626626- return ret;627627+ gpiochip_remove(&as_pci->gpio_chip);627628 pinctrl_unregister(as_pci->pctl);628629 return 0;629630}
+1-4
drivers/pinctrl/pinctrl-baytrail.c
···638638static int byt_gpio_remove(struct platform_device *pdev)639639{640640 struct byt_gpio *vg = platform_get_drvdata(pdev);641641- int err;642641643642 pm_runtime_disable(&pdev->dev);644644- err = gpiochip_remove(&vg->chip);645645- if (err)646646- dev_warn(&pdev->dev, "failed to remove gpio_chip.\n");643643+ gpiochip_remove(&vg->chip);647644648645 return 0;649646}
+2-8
drivers/pinctrl/pinctrl-coh901.c
···756756757757err_no_range:758758err_no_irqchip:759759- if (gpiochip_remove(&gpio->chip))760760- dev_err(&pdev->dev, "failed to remove gpio chip\n");759759+ gpiochip_remove(&gpio->chip);761760err_no_chip:762761 clk_disable_unprepare(gpio->clk);763762 dev_err(&pdev->dev, "module ERROR:%d\n", err);···766767static int __exit u300_gpio_remove(struct platform_device *pdev)767768{768769 struct u300_gpio *gpio = platform_get_drvdata(pdev);769769- int err;770770771771 /* Turn off the GPIO block */772772 writel(0x00000000U, gpio->base + U300_GPIO_CR);773773774774- err = gpiochip_remove(&gpio->chip);775775- if (err < 0) {776776- dev_err(gpio->dev, "unable to remove gpiochip: %d\n", err);777777- return err;778778- }774774+ gpiochip_remove(&gpio->chip);779775 clk_disable_unprepare(gpio->clk);780776 return 0;781777}
+4-12
drivers/pinctrl/pinctrl-rockchip.c
···14921492 for (--i, --bank; i >= 0; --i, --bank) {14931493 if (!bank->valid)14941494 continue;14951495-14961496- if (gpiochip_remove(&bank->gpio_chip))14971497- dev_err(&pdev->dev, "gpio chip %s remove failed\n",14981498- bank->gpio_chip.label);14951495+ gpiochip_remove(&bank->gpio_chip);14991496 }15001497 return ret;15011498}···15021505{15031506 struct rockchip_pin_ctrl *ctrl = info->ctrl;15041507 struct rockchip_pin_bank *bank = ctrl->pin_banks;15051505- int ret = 0;15061508 int i;1507150915081508- for (i = 0; !ret && i < ctrl->nr_banks; ++i, ++bank) {15101510+ for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {15091511 if (!bank->valid)15101512 continue;15111511-15121512- ret = gpiochip_remove(&bank->gpio_chip);15131513+ gpiochip_remove(&bank->gpio_chip);15131514 }1514151515151515- if (ret)15161516- dev_err(&pdev->dev, "gpio chip remove failed\n");15171517-15181518- return ret;15161516+ return 0;15191517}1520151815211519static int rockchip_get_bank_data(struct rockchip_pin_bank *bank,
+3-6
drivers/pinctrl/sh-pfc/gpio.c
···409409410410int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc)411411{412412- int err;413413- int ret;412412+ gpiochip_remove(&pfc->gpio->gpio_chip);413413+ gpiochip_remove(&pfc->func->gpio_chip);414414415415- ret = gpiochip_remove(&pfc->gpio->gpio_chip);416416- err = gpiochip_remove(&pfc->func->gpio_chip);417417-418418- return ret < 0 ? ret : err;415415+ return 0;419416}
+1-2
drivers/pinctrl/spear/pinctrl-plgpio.c
···606606607607remove_gpiochip:608608 dev_info(&pdev->dev, "Remove gpiochip\n");609609- if (gpiochip_remove(&plgpio->chip))610610- dev_err(&pdev->dev, "unable to remove gpiochip\n");609609+ gpiochip_remove(&plgpio->chip);611610unprepare_clk:612611 if (!IS_ERR(plgpio->clk))613612 clk_unprepare(plgpio->clk);
+1-2
drivers/pinctrl/sunxi/pinctrl-sunxi.c
···983983clk_error:984984 clk_disable_unprepare(clk);985985gpiochip_error:986986- if (gpiochip_remove(pctl->chip))987987- dev_err(&pdev->dev, "failed to remove gpio chip\n");986986+ gpiochip_remove(pctl->chip);988987pinctrl_error:989988 pinctrl_unregister(pctl->pctl_dev);990989 return ret;
+2-7
drivers/pinctrl/vt8500/pinctrl-wmt.c
···615615 return 0;616616617617fail_range:618618- if (gpiochip_remove(&data->gpio_chip))619619- dev_err(&pdev->dev, "failed to remove gpio chip\n");618618+ gpiochip_remove(&data->gpio_chip);620619fail_gpio:621620 pinctrl_unregister(data->pctl_dev);622621 return err;···624625int wmt_pinctrl_remove(struct platform_device *pdev)625626{626627 struct wmt_pinctrl_data *data = platform_get_drvdata(pdev);627627- int err;628628629629- err = gpiochip_remove(&data->gpio_chip);630630- if (err)631631- dev_err(&pdev->dev, "failed to remove gpio chip\n");632632-629629+ gpiochip_remove(&data->gpio_chip);633630 pinctrl_unregister(data->pctl_dev);634631635632 return 0;