|
@@ -1067,7 +1067,7 @@ static int u300_pmx_probe(struct platform_device *pdev)
|
|
if (IS_ERR(upmx->virtbase))
|
|
if (IS_ERR(upmx->virtbase))
|
|
return PTR_ERR(upmx->virtbase);
|
|
return PTR_ERR(upmx->virtbase);
|
|
|
|
|
|
- upmx->pctl = pinctrl_register(&u300_pmx_desc, &pdev->dev, upmx);
|
|
|
|
|
|
+ upmx->pctl = devm_pinctrl_register(&pdev->dev, &u300_pmx_desc, upmx);
|
|
if (IS_ERR(upmx->pctl)) {
|
|
if (IS_ERR(upmx->pctl)) {
|
|
dev_err(&pdev->dev, "could not register U300 pinmux driver\n");
|
|
dev_err(&pdev->dev, "could not register U300 pinmux driver\n");
|
|
return PTR_ERR(upmx->pctl);
|
|
return PTR_ERR(upmx->pctl);
|
|
@@ -1080,15 +1080,6 @@ static int u300_pmx_probe(struct platform_device *pdev)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int u300_pmx_remove(struct platform_device *pdev)
|
|
|
|
-{
|
|
|
|
- struct u300_pmx *upmx = platform_get_drvdata(pdev);
|
|
|
|
-
|
|
|
|
- pinctrl_unregister(upmx->pctl);
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static const struct of_device_id u300_pinctrl_match[] = {
|
|
static const struct of_device_id u300_pinctrl_match[] = {
|
|
{ .compatible = "stericsson,pinctrl-u300" },
|
|
{ .compatible = "stericsson,pinctrl-u300" },
|
|
{},
|
|
{},
|
|
@@ -1101,7 +1092,6 @@ static struct platform_driver u300_pmx_driver = {
|
|
.of_match_table = u300_pinctrl_match,
|
|
.of_match_table = u300_pinctrl_match,
|
|
},
|
|
},
|
|
.probe = u300_pmx_probe,
|
|
.probe = u300_pmx_probe,
|
|
- .remove = u300_pmx_remove,
|
|
|
|
};
|
|
};
|
|
|
|
|
|
static int __init u300_pmx_init(void)
|
|
static int __init u300_pmx_init(void)
|