Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
pinctrl: realtek: Switch to use devm functions
Simplify the probe() function by switching to devm-managed versions of
ioremap and pinctrl registration.
Signed-off-by: Yu-Chun Lin <eleanor.lin@realtek.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>
authored by
Yu-Chun Lin
and committed by
Linus Walleij
b7f698b2
6a6b238c
+5
-13
+5
-13
drivers/pinctrl/realtek/pinctrl-rtd.c
+5
-13
drivers/pinctrl/realtek/pinctrl-rtd.c
···
543
543
int rtd_pinctrl_probe(struct platform_device *pdev, const struct rtd_pinctrl_desc *desc)
544
544
{
545
545
struct rtd_pinctrl *data;
546
-
int ret;
547
546
548
547
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
549
548
if (!data)
550
549
return -ENOMEM;
551
550
552
-
data->base = of_iomap(pdev->dev.of_node, 0);
551
+
data->base = devm_platform_ioremap_resource(pdev, 0);
553
552
if (!data->base)
554
553
return -ENOMEM;
555
554
···
569
570
if (IS_ERR(data->regmap_pinctrl)) {
570
571
dev_err(data->dev, "failed to init regmap: %ld\n",
571
572
PTR_ERR(data->regmap_pinctrl));
572
-
ret = PTR_ERR(data->regmap_pinctrl);
573
-
goto unmap;
573
+
return PTR_ERR(data->regmap_pinctrl);
574
574
}
575
575
576
-
data->pcdev = pinctrl_register(&data->desc, &pdev->dev, data);
577
-
if (IS_ERR(data->pcdev)) {
578
-
ret = PTR_ERR(data->pcdev);
579
-
goto unmap;
580
-
}
576
+
data->pcdev = devm_pinctrl_register(&pdev->dev, &data->desc, data);
577
+
if (IS_ERR(data->pcdev))
578
+
return PTR_ERR(data->pcdev);
581
579
582
580
platform_set_drvdata(pdev, data);
583
581
584
582
dev_dbg(&pdev->dev, "probed\n");
585
583
586
584
return 0;
587
-
588
-
unmap:
589
-
iounmap(data->base);
590
-
return ret;
591
585
}
592
586
EXPORT_SYMBOL(rtd_pinctrl_probe);
593
587