Commit b005b2f5 authored Mar 09, 2018 by Andrey Smirnov Committed by Greg Kroah-Hartman Mar 14, 2018

nvmem: lpc18xx_otp: Convert to use devm_nvmem_register()



Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: cphealy@gmail.com
Cc: linux-kernel@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 90696a40

drivers/nvmem/lpc18xx_otp.c

+2 −14

Original line number	Diff line number	Diff line
		@@ -86,20 +86,9 @@ static int lpc18xx_otp_probe(struct platform_device *pdev)
		lpc18xx_otp_nvmem_config.dev = &pdev->dev;
		lpc18xx_otp_nvmem_config.priv = otp;

		nvmem = nvmem_register(&lpc18xx_otp_nvmem_config);
		if (IS_ERR(nvmem))
		return PTR_ERR(nvmem);
		nvmem = devm_nvmem_register(&pdev->dev, &lpc18xx_otp_nvmem_config);

		platform_set_drvdata(pdev, nvmem);

		return 0;
		}

		static int lpc18xx_otp_remove(struct platform_device *pdev)
		{
		struct nvmem_device *nvmem = platform_get_drvdata(pdev);

		return nvmem_unregister(nvmem);
		return PTR_ERR_OR_ZERO(nvmem);
		}

		static const struct of_device_id lpc18xx_otp_dt_ids[] = {
		@@ -110,7 +99,6 @@ MODULE_DEVICE_TABLE(of, lpc18xx_otp_dt_ids);

		static struct platform_driver lpc18xx_otp_driver = {
		.probe = lpc18xx_otp_probe,
		.remove = lpc18xx_otp_remove,
		.driver = {
		.name = "lpc18xx_otp",
		.of_match_table = lpc18xx_otp_dt_ids,

Admin message