[PATCH 0/2] nvmem: patches (set 2) for 5.12

[PATCH 0/2] nvmem: patches (set 2) for 5.12

[Srinivas Kandagatla]

Hi Greg,

Here are some last nvmem patches (set 2) for 5.12 which includes
- fixing a typo in Kconfig
- a fix of uninitialized pointer

If its not too late, Can you please queue them up for 5.12.

thanks for you help,
srini


Nicolas Saenz Julienne (1):
  nvmem: Kconfig: Correct typo in NVMEM_RMEM

Subbaraman Narayanamurthy (1):
  nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer

 drivers/nvmem/Kconfig          | 2 +-
 drivers/nvmem/qcom-spmi-sdam.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

-- 
2.21.0

[PATCH 1/2] nvmem: Kconfig: Correct typo in NVMEM_RMEM

[Srinivas Kandagatla]

From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>

s/drivers/driver/ as the configuration selects a single driver.

Suggested-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/nvmem/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index fecc19b884bf..75d2594c16e1 100644
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -273,7 +273,7 @@ config SPRD_EFUSE
 config NVMEM_RMEM
 	tristate "Reserved Memory Based Driver Support"
 	help
-	  This drivers maps reserved memory into an nvmem device. It might be
+	  This driver maps reserved memory into an nvmem device. It might be
 	  useful to expose information left by firmware in memory.
 
 	  This driver can also be built as a module. If so, the module
-- 
2.21.0

[PATCH 2/2] nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer

[Srinivas Kandagatla]

From: Subbaraman Narayanamurthy <subbaram@codeaurora.org>

"sdam->pdev" is uninitialized and it is used to print error logs.
Fix it. Since device pointer can be used from sdam_config, use it
directly thereby removing pdev pointer.

Fixes: 40ce9798794f ("nvmem: add QTI SDAM driver")
Cc: stable@vger.kernel.org
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/nvmem/qcom-spmi-sdam.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/nvmem/qcom-spmi-sdam.c b/drivers/nvmem/qcom-spmi-sdam.c
index a72704cd0468..f6e9f96933ca 100644
--- a/drivers/nvmem/qcom-spmi-sdam.c
+++ b/drivers/nvmem/qcom-spmi-sdam.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017, 2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017, 2020-2021, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/device.h>
@@ -18,7 +18,6 @@
 #define SDAM_PBS_TRIG_CLR		0xE6
 
 struct sdam_chip {
-	struct platform_device		*pdev;
 	struct regmap			*regmap;
 	struct nvmem_config		sdam_config;
 	unsigned int			base;
@@ -65,7 +64,7 @@ static int sdam_read(void *priv, unsigned int offset, void *val,
 				size_t bytes)
 {
 	struct sdam_chip *sdam = priv;
-	struct device *dev = &sdam->pdev->dev;
+	struct device *dev = sdam->sdam_config.dev;
 	int rc;
 
 	if (!sdam_is_valid(sdam, offset, bytes)) {
@@ -86,7 +85,7 @@ static int sdam_write(void *priv, unsigned int offset, void *val,
 				size_t bytes)
 {
 	struct sdam_chip *sdam = priv;
-	struct device *dev = &sdam->pdev->dev;
+	struct device *dev = sdam->sdam_config.dev;
 	int rc;
 
 	if (!sdam_is_valid(sdam, offset, bytes)) {
-- 
2.21.0

Re: [PATCH 0/2] nvmem: patches (set 2) for 5.12

[Greg KH]

On Fri, Feb 05, 2021 at 10:08:51AM +0000, Srinivas Kandagatla wrote:
> Hi Greg,
> 
> Here are some last nvmem patches (set 2) for 5.12 which includes
> - fixing a typo in Kconfig
> - a fix of uninitialized pointer
> 
> If its not too late, Can you please queue them up for 5.12.

Now merged, thanks!

greg k-h