pinctrl: mvebu: Use devm_pinctrl_register() for pinctrl registration
Use devm_pinctrl_register() for pin control registration and remove need of .remove callback. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Hongzhou Yang <hongzhou.yang@mediatek.com> Cc: Fabian Frederick <fabf@skynet.be> Cc: Andrew Andrianov <andrew@ncrmnt.org> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
e649f7ec8c
commit
699097a9b8
|
@ -417,18 +417,12 @@ static int armada_370_pinctrl_probe(struct platform_device *pdev)
|
||||||
return mvebu_pinctrl_probe(pdev);
|
return mvebu_pinctrl_probe(pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int armada_370_pinctrl_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
return mvebu_pinctrl_remove(pdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver armada_370_pinctrl_driver = {
|
static struct platform_driver armada_370_pinctrl_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "armada-370-pinctrl",
|
.name = "armada-370-pinctrl",
|
||||||
.of_match_table = armada_370_pinctrl_of_match,
|
.of_match_table = armada_370_pinctrl_of_match,
|
||||||
},
|
},
|
||||||
.probe = armada_370_pinctrl_probe,
|
.probe = armada_370_pinctrl_probe,
|
||||||
.remove = armada_370_pinctrl_remove,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(armada_370_pinctrl_driver);
|
module_platform_driver(armada_370_pinctrl_driver);
|
||||||
|
|
|
@ -435,18 +435,12 @@ static int armada_375_pinctrl_probe(struct platform_device *pdev)
|
||||||
return mvebu_pinctrl_probe(pdev);
|
return mvebu_pinctrl_probe(pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int armada_375_pinctrl_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
return mvebu_pinctrl_remove(pdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver armada_375_pinctrl_driver = {
|
static struct platform_driver armada_375_pinctrl_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "armada-375-pinctrl",
|
.name = "armada-375-pinctrl",
|
||||||
.of_match_table = of_match_ptr(armada_375_pinctrl_of_match),
|
.of_match_table = of_match_ptr(armada_375_pinctrl_of_match),
|
||||||
},
|
},
|
||||||
.probe = armada_375_pinctrl_probe,
|
.probe = armada_375_pinctrl_probe,
|
||||||
.remove = armada_375_pinctrl_remove,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(armada_375_pinctrl_driver);
|
module_platform_driver(armada_375_pinctrl_driver);
|
||||||
|
|
|
@ -446,18 +446,12 @@ static int armada_38x_pinctrl_probe(struct platform_device *pdev)
|
||||||
return mvebu_pinctrl_probe(pdev);
|
return mvebu_pinctrl_probe(pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int armada_38x_pinctrl_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
return mvebu_pinctrl_remove(pdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver armada_38x_pinctrl_driver = {
|
static struct platform_driver armada_38x_pinctrl_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "armada-38x-pinctrl",
|
.name = "armada-38x-pinctrl",
|
||||||
.of_match_table = of_match_ptr(armada_38x_pinctrl_of_match),
|
.of_match_table = of_match_ptr(armada_38x_pinctrl_of_match),
|
||||||
},
|
},
|
||||||
.probe = armada_38x_pinctrl_probe,
|
.probe = armada_38x_pinctrl_probe,
|
||||||
.remove = armada_38x_pinctrl_remove,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(armada_38x_pinctrl_driver);
|
module_platform_driver(armada_38x_pinctrl_driver);
|
||||||
|
|
|
@ -428,18 +428,12 @@ static int armada_39x_pinctrl_probe(struct platform_device *pdev)
|
||||||
return mvebu_pinctrl_probe(pdev);
|
return mvebu_pinctrl_probe(pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int armada_39x_pinctrl_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
return mvebu_pinctrl_remove(pdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver armada_39x_pinctrl_driver = {
|
static struct platform_driver armada_39x_pinctrl_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "armada-39x-pinctrl",
|
.name = "armada-39x-pinctrl",
|
||||||
.of_match_table = of_match_ptr(armada_39x_pinctrl_of_match),
|
.of_match_table = of_match_ptr(armada_39x_pinctrl_of_match),
|
||||||
},
|
},
|
||||||
.probe = armada_39x_pinctrl_probe,
|
.probe = armada_39x_pinctrl_probe,
|
||||||
.remove = armada_39x_pinctrl_remove,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(armada_39x_pinctrl_driver);
|
module_platform_driver(armada_39x_pinctrl_driver);
|
||||||
|
|
|
@ -502,18 +502,12 @@ static int armada_xp_pinctrl_probe(struct platform_device *pdev)
|
||||||
return mvebu_pinctrl_probe(pdev);
|
return mvebu_pinctrl_probe(pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int armada_xp_pinctrl_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
return mvebu_pinctrl_remove(pdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver armada_xp_pinctrl_driver = {
|
static struct platform_driver armada_xp_pinctrl_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "armada-xp-pinctrl",
|
.name = "armada-xp-pinctrl",
|
||||||
.of_match_table = armada_xp_pinctrl_of_match,
|
.of_match_table = armada_xp_pinctrl_of_match,
|
||||||
},
|
},
|
||||||
.probe = armada_xp_pinctrl_probe,
|
.probe = armada_xp_pinctrl_probe,
|
||||||
.remove = armada_xp_pinctrl_remove,
|
|
||||||
.suspend = armada_xp_pinctrl_suspend,
|
.suspend = armada_xp_pinctrl_suspend,
|
||||||
.resume = armada_xp_pinctrl_resume,
|
.resume = armada_xp_pinctrl_resume,
|
||||||
};
|
};
|
||||||
|
|
|
@ -840,12 +840,9 @@ static int dove_pinctrl_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
static int dove_pinctrl_remove(struct platform_device *pdev)
|
static int dove_pinctrl_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = mvebu_pinctrl_remove(pdev);
|
|
||||||
if (!IS_ERR(clk))
|
if (!IS_ERR(clk))
|
||||||
clk_disable_unprepare(clk);
|
clk_disable_unprepare(clk);
|
||||||
return ret;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_driver dove_pinctrl_driver = {
|
static struct platform_driver dove_pinctrl_driver = {
|
||||||
|
|
|
@ -481,18 +481,12 @@ static int kirkwood_pinctrl_probe(struct platform_device *pdev)
|
||||||
return mvebu_pinctrl_probe(pdev);
|
return mvebu_pinctrl_probe(pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int kirkwood_pinctrl_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
return mvebu_pinctrl_remove(pdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver kirkwood_pinctrl_driver = {
|
static struct platform_driver kirkwood_pinctrl_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "kirkwood-pinctrl",
|
.name = "kirkwood-pinctrl",
|
||||||
.of_match_table = kirkwood_pinctrl_of_match,
|
.of_match_table = kirkwood_pinctrl_of_match,
|
||||||
},
|
},
|
||||||
.probe = kirkwood_pinctrl_probe,
|
.probe = kirkwood_pinctrl_probe,
|
||||||
.remove = kirkwood_pinctrl_remove,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(kirkwood_pinctrl_driver);
|
module_platform_driver(kirkwood_pinctrl_driver);
|
||||||
|
|
|
@ -711,7 +711,7 @@ int mvebu_pinctrl_probe(struct platform_device *pdev)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
pctl->pctldev = pinctrl_register(&pctl->desc, &pdev->dev, pctl);
|
pctl->pctldev = devm_pinctrl_register(&pdev->dev, &pctl->desc, pctl);
|
||||||
if (IS_ERR(pctl->pctldev)) {
|
if (IS_ERR(pctl->pctldev)) {
|
||||||
dev_err(&pdev->dev, "unable to register pinctrl driver\n");
|
dev_err(&pdev->dev, "unable to register pinctrl driver\n");
|
||||||
return PTR_ERR(pctl->pctldev);
|
return PTR_ERR(pctl->pctldev);
|
||||||
|
@ -725,10 +725,3 @@ int mvebu_pinctrl_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int mvebu_pinctrl_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct mvebu_pinctrl *pctl = platform_get_drvdata(pdev);
|
|
||||||
pinctrl_unregister(pctl->pctldev);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
|
@ -202,6 +202,5 @@ static inline int default_mpp_ctrl_set(void __iomem *base, unsigned int pid,
|
||||||
}
|
}
|
||||||
|
|
||||||
int mvebu_pinctrl_probe(struct platform_device *pdev);
|
int mvebu_pinctrl_probe(struct platform_device *pdev);
|
||||||
int mvebu_pinctrl_remove(struct platform_device *pdev);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -239,18 +239,12 @@ static int orion_pinctrl_probe(struct platform_device *pdev)
|
||||||
return mvebu_pinctrl_probe(pdev);
|
return mvebu_pinctrl_probe(pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int orion_pinctrl_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
return mvebu_pinctrl_remove(pdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver orion_pinctrl_driver = {
|
static struct platform_driver orion_pinctrl_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "orion-pinctrl",
|
.name = "orion-pinctrl",
|
||||||
.of_match_table = of_match_ptr(orion_pinctrl_of_match),
|
.of_match_table = of_match_ptr(orion_pinctrl_of_match),
|
||||||
},
|
},
|
||||||
.probe = orion_pinctrl_probe,
|
.probe = orion_pinctrl_probe,
|
||||||
.remove = orion_pinctrl_remove,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(orion_pinctrl_driver);
|
module_platform_driver(orion_pinctrl_driver);
|
||||||
|
|
Loading…
Reference in New Issue