[10/26] nvmem: sunxi_sid: use devm_nvmem_register()

Message ID	20180921134026.4596-11-srinivas.kandagatla@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Bartosz Golaszewski <bgolaszewski@baylibre.com>, Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Subject: [PATCH 10/26] nvmem: sunxi_sid: use devm_nvmem_register() Date: Fri, 21 Sep 2018 06:40:10 -0700 Message-Id: <20180921134026.4596-11-srinivas.kandagatla@linaro.org> In-Reply-To: <20180921134026.4596-1-srinivas.kandagatla@linaro.org> References: <20180921134026.4596-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	nvmem: patches for 4.20 \| expand [00/26] nvmem: patches for 4.20 [01/26] eeprom: eeprom_93xx46: use resource management [02/26] eeprom: at25: use devm_nvmem_register() [03/26] nvmem: provide nvmem_dev_name() [04/26] nvmem: remove the name field from struct nvmem_device [05/26] nvmem: use list_for_each_entry_safe in nvmem_device_remove_all_cells() [06/26] nvmem: remove a stray newline [07/26] nvmem: check the return value of nvmem_add_cells() [08/26] nvmem: use kref [09/26] nvmem: sunxi_sid: return -ENOMEM if kzalloc() fails [10/26] nvmem: sunxi_sid: use devm_nvmem_register() [11/26] nvmem: lpc18xx_eeprom: use devm_nvmem_register() [12/26] nvmem: mxs-ocotp: use devm_nvmem_register() [13/26] nvmem: change the signature of nvmem_unregister() [14/26] nvmem: remove the global cell list [15/26] nvmem: add support for cell info [16/26] nvmem: resolve cells from DT at registration time [17/26] nvmem: add support for cell lookups from machine code [18/26] Documentation: nvmem: document cell tables and lookup entries [19/26] nvmem: add a notifier chain [20/26] nvmem: use SPDX license identifiers [21/26] nvmem: make the naming of arguments in nvmem_cell_get() consistent [22/26] nvmem: use EOPNOTSUPP instead of ENOSYS [23/26] nvmem: fix commenting style [24/26] nvmem: use octal permissions instead of constants [25/26] nvmem: sunxi_sid: remove unused variable in probe [26/26] nvmem: make nvmem_add_cells() static

Message ID

20180921134026.4596-11-srinivas.kandagatla@linaro.org

State

New

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: srinivas.kandagatla@linaro.org
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH 10/26] nvmem: sunxi_sid: use devm_nvmem_register()
Date: Fri, 21 Sep 2018 06:40:10 -0700
Message-Id: <20180921134026.4596-11-srinivas.kandagatla@linaro.org>
In-Reply-To: <20180921134026.4596-1-srinivas.kandagatla@linaro.org>
References: <20180921134026.4596-1-srinivas.kandagatla@linaro.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

nvmem: patches for 4.20 | expand

Commit Message

Srinivas Kandagatla Sept. 21, 2018, 1:40 p.m. UTC

From: Bartosz Golaszewski <bgolaszewski@baylibre.com>


Use the resource managed variant of nvmem_register().

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

---
 drivers/nvmem/sunxi_sid.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

-- 
2.19.0

diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
index 4d0b7e72aa2e..1310f8af37f8 100644
--- a/drivers/nvmem/sunxi_sid.c
+++ b/drivers/nvmem/sunxi_sid.c
@@ -181,15 +181,13 @@  static int sunxi_sid_probe(struct platform_device *pdev)
 	else
 		econfig.reg_read = sunxi_sid_read;
 	econfig.priv = sid;
-	nvmem = nvmem_register(&econfig);
+	nvmem = devm_nvmem_register(dev, &econfig);
 	if (IS_ERR(nvmem))
 		return PTR_ERR(nvmem);
 
 	randomness = kzalloc(size, GFP_KERNEL);
-	if (!randomness) {
-		ret = -ENOMEM;
-		goto err_unreg_nvmem;
-	}
+	if (!randomness)
+		return -ENOMEM;
 
 	for (i = 0; i < size; i++)
 		econfig.reg_read(sid, i, &randomness[i], 1);
@@ -200,17 +198,6 @@  static int sunxi_sid_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, nvmem);
 
 	return 0;
-
-err_unreg_nvmem:
-	nvmem_unregister(nvmem);
-	return ret;
-}
-
-static int sunxi_sid_remove(struct platform_device *pdev)
-{
-	struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
-	return nvmem_unregister(nvmem);
 }
 
 static const struct sunxi_sid_cfg sun4i_a10_cfg = {
@@ -243,7 +230,6 @@  MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);
 
 static struct platform_driver sunxi_sid_driver = {
 	.probe = sunxi_sid_probe,
-	.remove = sunxi_sid_remove,
 	.driver = {
 		.name = "eeprom-sunxi-sid",
 		.of_match_table = sunxi_sid_of_match,

[10/26] nvmem: sunxi_sid: use devm_nvmem_register()

Commit Message

Patch