|
@@ -47,13 +47,6 @@ static int qfprom_reg_write(void *context,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int qfprom_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
|
|
|
-
|
|
|
- return nvmem_unregister(nvmem);
|
|
|
-}
|
|
|
-
|
|
|
static struct nvmem_config econfig = {
|
|
|
.name = "qfprom",
|
|
|
.stride = 1,
|
|
@@ -82,13 +75,9 @@ static int qfprom_probe(struct platform_device *pdev)
|
|
|
econfig.dev = dev;
|
|
|
econfig.priv = priv;
|
|
|
|
|
|
- nvmem = nvmem_register(&econfig);
|
|
|
- if (IS_ERR(nvmem))
|
|
|
- return PTR_ERR(nvmem);
|
|
|
-
|
|
|
- platform_set_drvdata(pdev, nvmem);
|
|
|
+ nvmem = devm_nvmem_register(dev, &econfig);
|
|
|
|
|
|
- return 0;
|
|
|
+ return PTR_ERR_OR_ZERO(nvmem);
|
|
|
}
|
|
|
|
|
|
static const struct of_device_id qfprom_of_match[] = {
|
|
@@ -99,7 +88,6 @@ MODULE_DEVICE_TABLE(of, qfprom_of_match);
|
|
|
|
|
|
static struct platform_driver qfprom_driver = {
|
|
|
.probe = qfprom_probe,
|
|
|
- .remove = qfprom_remove,
|
|
|
.driver = {
|
|
|
.name = "qcom,qfprom",
|
|
|
.of_match_table = qfprom_of_match,
|