Skip to content

Commit 8e03e6e

Browse files
committed
pinctrl: tangier: Join tng_pinctrl_probe() into its wrapper
There is no clear sign why we have tng_pinctrl_probe() in the first place when it has already been using managed calls. Join the function into its devm_tng_pinctrl_probe() wrapper. Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent ae15231 commit 8e03e6e

1 file changed

Lines changed: 6 additions & 13 deletions

File tree

drivers/pinctrl/intel/pinctrl-tangier.c

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -518,15 +518,19 @@ static const struct pinctrl_desc tng_pinctrl_desc = {
518518
.owner = THIS_MODULE,
519519
};
520520

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)
523522
{
524523
struct device *dev = &pdev->dev;
524+
const struct tng_pinctrl *data;
525525
struct tng_family *families;
526526
struct tng_pinctrl *tp;
527527
void __iomem *regs;
528528
unsigned int i;
529529

530+
data = device_get_match_data(dev);
531+
if (!data)
532+
return -ENODATA;
533+
530534
tp = devm_kmemdup(dev, data, sizeof(*data), GFP_KERNEL);
531535
if (!tp)
532536
return -ENOMEM;
@@ -566,17 +570,6 @@ static int tng_pinctrl_probe(struct platform_device *pdev,
566570

567571
return 0;
568572
}
569-
570-
int devm_tng_pinctrl_probe(struct platform_device *pdev)
571-
{
572-
const struct tng_pinctrl *data;
573-
574-
data = device_get_match_data(&pdev->dev);
575-
if (!data)
576-
return -ENODATA;
577-
578-
return tng_pinctrl_probe(pdev, data);
579-
}
580573
EXPORT_SYMBOL_NS_GPL(devm_tng_pinctrl_probe, "PINCTRL_TANGIER");
581574

582575
MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");

0 commit comments

Comments
 (0)