From: Greg Kroah-Hartman Date: Mon, 25 Mar 2024 10:49:36 +0000 (+0100) Subject: drop queue-5.10/remoteproc-stm32-fix-incorrect-optional-pointers.patch X-Git-Tag: v6.8.2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ccf4fb6413692bee9656810df63f0786f94aa73;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/remoteproc-stm32-fix-incorrect-optional-pointers.patch broke the build --- diff --git a/queue-5.10/remoteproc-stm32-fix-incorrect-optional-pointers.patch b/queue-5.10/remoteproc-stm32-fix-incorrect-optional-pointers.patch deleted file mode 100644 index 0a90ea5205b..00000000000 --- a/queue-5.10/remoteproc-stm32-fix-incorrect-optional-pointers.patch +++ /dev/null @@ -1,77 +0,0 @@ -From fb2bdd32b231b70e6a3f1054528692f604db25d8 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Mon, 24 Jul 2023 21:56:49 +0200 -Subject: remoteproc: stm32: fix incorrect optional pointers - -From: Arnd Bergmann - -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 -Closes: https://lore.kernel.org/oe-kbuild-all/202307242300.ia82qBTp-lkp@intel.com -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 -Acked-by: Arnaud Pouliquen -Link: https://lore.kernel.org/r/20230724195704.2432382-1-arnd@kernel.org -Signed-off-by: Mathieu Poirier -Signed-off-by: Greg Kroah-Hartman ---- - 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 -@@ -870,7 +870,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; -@@ -881,7 +881,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; -@@ -892,16 +892,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); diff --git a/queue-5.10/series b/queue-5.10/series index 9ec00a790d6..0a035cc2bc5 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -236,4 +236,3 @@ bpf-report-rcu-qs-in-cpumap-kthread.patch spi-spi-mt65xx-fix-null-pointer-access-in-interrupt-.patch regmap-add-missing-map-bus-check.patch remoteproc-stm32-fix-phys_addr_t-format-string.patch -remoteproc-stm32-fix-incorrect-optional-pointers.patch