This is a note to let you know that I've just added the patch titled
remoteproc: stm32: fix incorrect optional pointers
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
remoteproc-stm32-fix-incorrect-optional-pointers.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fb2bdd32b231b70e6a3f1054528692f604db25d8 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@xxxxxxxx>
Date: Mon, 24 Jul 2023 21:56:49 +0200
Subject: remoteproc: stm32: fix incorrect optional pointers
From: Arnd Bergmann <arnd@xxxxxxxx>
commit fb2bdd32b231b70e6a3f1054528692f604db25d8 upstream.
Compile-testing without CONFIG_OF shows that the of_match_ptr() macro
was used incorrectly here:
drivers/remoteproc/stm32_rproc.c:662:34: warning: unused variable 'stm32_rproc_match' [-Wunused-const-variable]
As in almost every driver, the solution is simply to remove the
use of this macro. The same thing happened with the deprecated
SIMPLE_DEV_PM_OPS(), but the corresponding warning was already shut
up with __maybe_unused annotations, so fix those as well by using the
correct DEFINE_SIMPLE_DEV_PM_OPS() macros and removing the extraneous
__maybe_unused modifiers. For completeness, also add a pm_ptr() to let
the PM ops be eliminated completely when CONFIG_PM is turned off.
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202307242300.ia82qBTp-lkp@xxxxxxxxx
Fixes: 03bd158e1535 ("remoteproc: stm32: use correct format strings on 64-bit")
Fixes: 410119ee29b6 ("remoteproc: stm32: wakeup the system by wdg irq")
Fixes: 13140de09cc2 ("remoteproc: stm32: add an ST stm32_rproc driver")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Acked-by: Arnaud Pouliquen <arnaud.pouliquen@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230724195704.2432382-1-arnd@xxxxxxxxxx
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/remoteproc/stm32_rproc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -889,7 +889,7 @@ static int stm32_rproc_remove(struct pla
return 0;
}
-static int __maybe_unused stm32_rproc_suspend(struct device *dev)
+static int stm32_rproc_suspend(struct device *dev)
{
struct rproc *rproc = dev_get_drvdata(dev);
struct stm32_rproc *ddata = rproc->priv;
@@ -900,7 +900,7 @@ static int __maybe_unused stm32_rproc_su
return 0;
}
-static int __maybe_unused stm32_rproc_resume(struct device *dev)
+static int stm32_rproc_resume(struct device *dev)
{
struct rproc *rproc = dev_get_drvdata(dev);
struct stm32_rproc *ddata = rproc->priv;
@@ -911,16 +911,16 @@ static int __maybe_unused stm32_rproc_re
return 0;
}
-static SIMPLE_DEV_PM_OPS(stm32_rproc_pm_ops,
- stm32_rproc_suspend, stm32_rproc_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(stm32_rproc_pm_ops,
+ stm32_rproc_suspend, stm32_rproc_resume);
static struct platform_driver stm32_rproc_driver = {
.probe = stm32_rproc_probe,
.remove = stm32_rproc_remove,
.driver = {
.name = "stm32-rproc",
- .pm = &stm32_rproc_pm_ops,
- .of_match_table = of_match_ptr(stm32_rproc_match),
+ .pm = pm_ptr(&stm32_rproc_pm_ops),
+ .of_match_table = stm32_rproc_match,
},
};
module_platform_driver(stm32_rproc_driver);
Patches currently in stable-queue which might be from arnd@xxxxxxxx are
queue-6.1/soc-fsl-dpio-fix-kcalloc-argument-order.patch
queue-6.1/asoc-meson-aiu-fix-function-pointer-type-mismatch.patch
queue-6.1/mtd-rawnand-lpc32xx_mlc-fix-irq-handler-prototype.patch
queue-6.1/media-pvrusb2-fix-pvr2_stream_callback-casts.patch
queue-6.1/media-mediatek-vcodec-avoid-wcast-function-type-stri.patch
queue-6.1/scsi-csiostor-avoid-function-pointer-casts.patch
queue-6.1/alsa-seq-fix-function-cast-warnings.patch
queue-6.1/fs-select-rework-stack-allocation-hack-for-clang.patch
queue-6.1/arm64-dts-fix-dtc-interrupt_provider-warnings.patch
queue-6.1/wifi-brcmsmac-avoid-function-pointer-casts.patch
queue-6.1/scsi-bfa-fix-function-pointer-type-mismatch-for-hcb_.patch
queue-6.1/asoc-meson-t9015-fix-function-pointer-type-mismatch.patch
queue-6.1/rtc-mt6397-select-irq_domain-instead-of-depending-on.patch
queue-6.1/remoteproc-stm32-use-correct-format-strings-on-64-bi.patch
queue-6.1/media-dvb-frontends-avoid-stack-overflow-warnings-wi.patch
queue-6.1/crypto-arm-sha-fix-function-cast-warnings.patch
queue-6.1/remoteproc-stm32-fix-incorrect-optional-pointers.patch
