de8d5b50e2
Removed upstreamed: backport-5.15/807-v6.1-0003-nvmem-core-add-error-handling-for-dev_set_name.patch[1] bcm47xx/patches-5.15/070-net-bgmac-fix-BCM5358-support-by-setting-correct-fla.patch[2] Added fix: backport-5.15/883-0001-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch[3] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.95&id=14eea6449473c1f55e196cc104ba16d144465869 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.95&id=2603a5ca6223bb3a88814e2728335eec14f715ab 3. https://lore.kernel.org/stable/20230227211548.13923-1-kuniyu@amazon.com Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From 5825b2c6762611e67ccaf3ccf64485365a120f0b Mon Sep 17 00:00:00 2001
|
|
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Date: Sun, 20 Feb 2022 15:15:16 +0000
|
|
Subject: [PATCH] nvmem: core: Use devm_add_action_or_reset()
|
|
|
|
Slightly simplify the devm_nvmem_register() by using the
|
|
devm_add_action_or_reset().
|
|
|
|
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20220220151527.17216-3-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/core.c | 22 +++++++++-------------
|
|
1 file changed, 9 insertions(+), 13 deletions(-)
|
|
|
|
--- a/drivers/nvmem/core.c
|
|
+++ b/drivers/nvmem/core.c
|
|
@@ -905,9 +905,9 @@ void nvmem_unregister(struct nvmem_devic
|
|
}
|
|
EXPORT_SYMBOL_GPL(nvmem_unregister);
|
|
|
|
-static void devm_nvmem_release(struct device *dev, void *res)
|
|
+static void devm_nvmem_unregister(void *nvmem)
|
|
{
|
|
- nvmem_unregister(*(struct nvmem_device **)res);
|
|
+ nvmem_unregister(nvmem);
|
|
}
|
|
|
|
/**
|
|
@@ -924,20 +924,16 @@ static void devm_nvmem_release(struct de
|
|
struct nvmem_device *devm_nvmem_register(struct device *dev,
|
|
const struct nvmem_config *config)
|
|
{
|
|
- struct nvmem_device **ptr, *nvmem;
|
|
-
|
|
- ptr = devres_alloc(devm_nvmem_release, sizeof(*ptr), GFP_KERNEL);
|
|
- if (!ptr)
|
|
- return ERR_PTR(-ENOMEM);
|
|
+ struct nvmem_device *nvmem;
|
|
+ int ret;
|
|
|
|
nvmem = nvmem_register(config);
|
|
+ if (IS_ERR(nvmem))
|
|
+ return nvmem;
|
|
|
|
- if (!IS_ERR(nvmem)) {
|
|
- *ptr = nvmem;
|
|
- devres_add(dev, ptr);
|
|
- } else {
|
|
- devres_free(ptr);
|
|
- }
|
|
+ ret = devm_add_action_or_reset(dev, devm_nvmem_unregister, nvmem);
|
|
+ if (ret)
|
|
+ return ERR_PTR(ret);
|
|
|
|
return nvmem;
|
|
}
|