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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'intel-pinctrl-v6.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel

intel-pinctrl for v6.20-2

* Remove duplicate error messages when registering pin control
* Miscellaneous changes

Signed-off-by: Linus Walleij <linusw@kernel.org>

+11 -18
+1 -1
drivers/pinctrl/intel/pinctrl-baytrail.c
··· 1616 1616 1617 1617 vg->pctldev = devm_pinctrl_register(dev, &vg->pctldesc, vg); 1618 1618 if (IS_ERR(vg->pctldev)) 1619 - return dev_err_probe(dev, PTR_ERR(vg->pctldev), "failed to register pinctrl\n"); 1619 + return PTR_ERR(vg->pctldev); 1620 1620 1621 1621 ret = byt_gpio_probe(vg); 1622 1622 if (ret)
+1 -1
drivers/pinctrl/intel/pinctrl-cherryview.c
··· 1644 1644 1645 1645 pctrl->pctldev = devm_pinctrl_register(dev, &pctrl->pctldesc, pctrl); 1646 1646 if (IS_ERR(pctrl->pctldev)) 1647 - return dev_err_probe(dev, PTR_ERR(pctrl->pctldev), "failed to register pinctrl\n"); 1647 + return PTR_ERR(pctrl->pctldev); 1648 1648 1649 1649 ret = chv_gpio_probe(pctrl, irq); 1650 1650 if (ret)
+1 -1
drivers/pinctrl/intel/pinctrl-intel.c
··· 1673 1673 1674 1674 pctrl->pctldev = devm_pinctrl_register(dev, &pctrl->pctldesc, pctrl); 1675 1675 if (IS_ERR(pctrl->pctldev)) 1676 - return dev_err_probe(dev, PTR_ERR(pctrl->pctldev), "failed to register pinctrl\n"); 1676 + return PTR_ERR(pctrl->pctldev); 1677 1677 1678 1678 ret = intel_gpio_probe(pctrl, irq); 1679 1679 if (ret)
+1 -1
drivers/pinctrl/intel/pinctrl-lynxpoint.c
··· 735 735 736 736 lg->pctldev = devm_pinctrl_register(dev, &lg->pctldesc, lg); 737 737 if (IS_ERR(lg->pctldev)) 738 - return dev_err_probe(dev, PTR_ERR(lg->pctldev), "failed to register pinctrl\n"); 738 + return PTR_ERR(lg->pctldev); 739 739 740 740 platform_set_drvdata(pdev, lg); 741 741
+7 -14
drivers/pinctrl/intel/pinctrl-tangier.c
··· 518 518 .owner = THIS_MODULE, 519 519 }; 520 520 521 - static int tng_pinctrl_probe(struct platform_device *pdev, 522 - const struct tng_pinctrl *data) 521 + int devm_tng_pinctrl_probe(struct platform_device *pdev) 523 522 { 524 523 struct device *dev = &pdev->dev; 524 + const struct tng_pinctrl *data; 525 525 struct tng_family *families; 526 526 struct tng_pinctrl *tp; 527 527 void __iomem *regs; 528 528 unsigned int i; 529 + 530 + data = device_get_match_data(dev); 531 + if (!data) 532 + return -ENODATA; 529 533 530 534 tp = devm_kmemdup(dev, data, sizeof(*data), GFP_KERNEL); 531 535 if (!tp) ··· 566 562 567 563 tp->pctldev = devm_pinctrl_register(dev, &tp->pctldesc, tp); 568 564 if (IS_ERR(tp->pctldev)) 569 - return dev_err_probe(dev, PTR_ERR(tp->pctldev), "failed to register pinctrl\n"); 565 + return PTR_ERR(tp->pctldev); 570 566 571 567 return 0; 572 - } 573 - 574 - int devm_tng_pinctrl_probe(struct platform_device *pdev) 575 - { 576 - const struct tng_pinctrl *data; 577 - 578 - data = device_get_match_data(&pdev->dev); 579 - if (!data) 580 - return -ENODATA; 581 - 582 - return tng_pinctrl_probe(pdev, data); 583 568 } 584 569 EXPORT_SYMBOL_NS_GPL(devm_tng_pinctrl_probe, "PINCTRL_TANGIER"); 585 570