Drop all of the code related to .remove hook and make use of devm_nvmem_register() instead. Cc: Srinivas Kandagatla <srinivas.kandagatla at linaro.org> Cc: Heiko Stuebner <heiko at sntech.de> Cc: Masahiro Yamada <yamada.masahiro at socionext.com> Cc: Carlo Caione <carlo at caione.org> Cc: Kevin Hilman <khilman at baylibre.com> Cc: Matthias Brugger <matthias.bgg at gmail.com> Cc: cphealy at gmail.com Cc: linux-kernel at vger.kernel.org Cc: linux-mediatek at lists.infradead.org Cc: linux-rockchip at lists.infradead.org Cc: linux-amlogic at lists.infradead.org Cc: linux-arm-kernel at lists.infradead.org Signed-off-by: Andrey Smirnov <andrew.smirnov at gmail.com> --- drivers/nvmem/meson-mx-efuse.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c index 41d3a3c1104e..db1e8b072034 100644 --- a/drivers/nvmem/meson-mx-efuse.c +++ b/drivers/nvmem/meson-mx-efuse.c @@ -233,25 +233,15 @@ static int meson_mx_efuse_probe(struct platform_device *pdev) return PTR_ERR(efuse->core_clk); } - efuse->nvmem = nvmem_register(&efuse->config); + efuse->nvmem = devm_nvmem_register(&pdev->dev, &efuse->config); if (IS_ERR(efuse->nvmem)) return PTR_ERR(efuse->nvmem); - platform_set_drvdata(pdev, efuse); - return 0; } -static int meson_mx_efuse_remove(struct platform_device *pdev) -{ - struct meson_mx_efuse *efuse = platform_get_drvdata(pdev); - - return nvmem_unregister(efuse->nvmem); -} - static struct platform_driver meson_mx_efuse_driver = { .probe = meson_mx_efuse_probe, - .remove = meson_mx_efuse_remove, .driver = { .name = "meson-mx-efuse", .of_match_table = meson_mx_efuse_match, -- 2.14.3