torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
intel-pinctrl for v6.20-2

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

Signed-off-by: Linus Walleij <linusw@kernel.org>
This commit is contained in:
Linus Walleij
2026-01-29 23:32:57 +01:00
parent c0b4a4feeb 8e03e6ecc2
commit 1296611607
5 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/intel/pinctrl-baytrail.c
View File

@@ -1616,7 +1616,7 @@ static int byt_pinctrl_probe(struct platform_device *pdev)
vg->pctldev = devm_pinctrl_register(dev, &vg->pctldesc, vg);
if (IS_ERR(vg->pctldev))
return dev_err_probe(dev, PTR_ERR(vg->pctldev), "failed to register pinctrl\n");
return PTR_ERR(vg->pctldev);
ret = byt_gpio_probe(vg);
if (ret)

2
drivers/pinctrl/intel/pinctrl-cherryview.c
View File

@@ -1644,7 +1644,7 @@ static int chv_pinctrl_probe(struct platform_device *pdev)
pctrl->pctldev = devm_pinctrl_register(dev, &pctrl->pctldesc, pctrl);
if (IS_ERR(pctrl->pctldev))
return dev_err_probe(dev, PTR_ERR(pctrl->pctldev), "failed to register pinctrl\n");
return PTR_ERR(pctrl->pctldev);
ret = chv_gpio_probe(pctrl, irq);
if (ret)

2
drivers/pinctrl/intel/pinctrl-intel.c
View File

@@ -1673,7 +1673,7 @@ int intel_pinctrl_probe(struct platform_device *pdev,
pctrl->pctldev = devm_pinctrl_register(dev, &pctrl->pctldesc, pctrl);
if (IS_ERR(pctrl->pctldev))
return dev_err_probe(dev, PTR_ERR(pctrl->pctldev), "failed to register pinctrl\n");
return PTR_ERR(pctrl->pctldev);
ret = intel_gpio_probe(pctrl, irq);
if (ret)

2
drivers/pinctrl/intel/pinctrl-lynxpoint.c
View File

@@ -735,7 +735,7 @@ static int lp_gpio_probe(struct platform_device *pdev)
lg->pctldev = devm_pinctrl_register(dev, &lg->pctldesc, lg);
if (IS_ERR(lg->pctldev))
return dev_err_probe(dev, PTR_ERR(lg->pctldev), "failed to register pinctrl\n");
return PTR_ERR(lg->pctldev);
platform_set_drvdata(pdev, lg);

21
drivers/pinctrl/intel/pinctrl-tangier.c
View File

@@ -518,15 +518,19 @@ static const struct pinctrl_desc tng_pinctrl_desc = {
.owner = THIS_MODULE,
};
static int tng_pinctrl_probe(struct platform_device *pdev,
const struct tng_pinctrl *data)
int devm_tng_pinctrl_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
const struct tng_pinctrl *data;
struct tng_family *families;
struct tng_pinctrl *tp;
void __iomem *regs;
unsigned int i;
data = device_get_match_data(dev);
if (!data)
return -ENODATA;
tp = devm_kmemdup(dev, data, sizeof(*data), GFP_KERNEL);
if (!tp)
return -ENOMEM;
@@ -562,21 +566,10 @@ static int tng_pinctrl_probe(struct platform_device *pdev,
tp->pctldev = devm_pinctrl_register(dev, &tp->pctldesc, tp);
if (IS_ERR(tp->pctldev))
return dev_err_probe(dev, PTR_ERR(tp->pctldev), "failed to register pinctrl\n");
return PTR_ERR(tp->pctldev);
return 0;
}
int devm_tng_pinctrl_probe(struct platform_device *pdev)
{
const struct tng_pinctrl *data;
data = device_get_match_data(&pdev->dev);
if (!data)
return -ENODATA;
return tng_pinctrl_probe(pdev, data);
}
EXPORT_SYMBOL_NS_GPL(devm_tng_pinctrl_probe, "PINCTRL_TANGIER");
MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");