|
@@ -138,25 +138,13 @@ static int imx_iim_probe(struct platform_device *pdev)
|
|
cfg.size = drvdata->nregs;
|
|
cfg.size = drvdata->nregs;
|
|
cfg.priv = iim;
|
|
cfg.priv = iim;
|
|
|
|
|
|
- nvmem = nvmem_register(&cfg);
|
|
|
|
- if (IS_ERR(nvmem))
|
|
|
|
- return PTR_ERR(nvmem);
|
|
|
|
|
|
+ nvmem = devm_nvmem_register(dev, &cfg);
|
|
|
|
|
|
- platform_set_drvdata(pdev, nvmem);
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-static int imx_iim_remove(struct platform_device *pdev)
|
|
|
|
-{
|
|
|
|
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
|
|
|
|
-
|
|
|
|
- return nvmem_unregister(nvmem);
|
|
|
|
|
|
+ return PTR_ERR_OR_ZERO(nvmem);
|
|
}
|
|
}
|
|
|
|
|
|
static struct platform_driver imx_iim_driver = {
|
|
static struct platform_driver imx_iim_driver = {
|
|
.probe = imx_iim_probe,
|
|
.probe = imx_iim_probe,
|
|
- .remove = imx_iim_remove,
|
|
|
|
.driver = {
|
|
.driver = {
|
|
.name = "imx-iim",
|
|
.name = "imx-iim",
|
|
.of_match_table = imx_iim_dt_ids,
|
|
.of_match_table = imx_iim_dt_ids,
|