Commit fb2bdd32 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mathieu Poirier
Browse files

remoteproc: stm32: fix incorrect optional pointers 



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: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202307242300.ia82qBTp-lkp@intel.com


Fixes: 03bd158e ("remoteproc: stm32: use correct format strings on 64-bit")
Fixes: 410119ee ("remoteproc: stm32: wakeup the system by wdg irq")
Fixes: 13140de0 ("remoteproc: stm32: add an ST stm32_rproc driver")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarArnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Link: https://lore.kernel.org/r/20230724195704.2432382-1-arnd@kernel.org


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 49f80a7a

drivers/remoteproc/stm32_rproc.c

+6 −6
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ static void stm32_rproc_remove(struct platform_device *pdev) 
	rproc_free(rproc);

}



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;
@@ -932,7 +932,7 @@ static int __maybe_unused stm32_rproc_suspend(struct device *dev) 
	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;
@@ -943,7 +943,7 @@ static int __maybe_unused stm32_rproc_resume(struct device *dev) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(stm32_rproc_pm_ops,

static DEFINE_SIMPLE_DEV_PM_OPS(stm32_rproc_pm_ops,

				stm32_rproc_suspend, stm32_rproc_resume);



static struct platform_driver stm32_rproc_driver = {
@@ -951,8 +951,8 @@ static struct platform_driver stm32_rproc_driver = { 
	.remove_new = 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);