Commit 7b50567b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

media: i2c: imx290: fix conditional function defintions 



The runtime suspend/resume functions are only referenced from the
dev_pm_ops, but they use the old SET_RUNTIME_PM_OPS() helper that
requires a __maybe_unused annotation to avoid a warning:

  drivers/media/i2c/imx290.c:1082:12: error: unused function 'imx290_runtime_resume' [-Werror,-Wunused-function]
  static int imx290_runtime_resume(struct device *dev)
             ^
  drivers/media/i2c/imx290.c:1090:12: error: unused function 'imx290_runtime_suspend' [-Werror,-Wunused-function]
  static int imx290_runtime_suspend(struct device *dev)
             ^

Convert this to the new RUNTIME_PM_OPS() helper that so this is not
required.  To improve this further, also use the pm_ptr() helper that
lets the dev_pm_ops get dropped entirely when CONFIG_PM is disabled.

A related mistake happened in the of_match_ptr() macro here, which like
SET_RUNTIME_PM_OPS() requires the match table to be marked as
__maybe_unused, though I could not reproduce building this without
CONFIG_OF.  Remove the of_match_ptr() here as there is no point in
dropping the match table in configurations without CONFIG_OF.

Fixes: 02852c01 ("media: i2c: imx290: Initialize runtime PM before subdev")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reported-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Reviewed-by: default avatarManivannan Sadhasivam <mani@kernel.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0264d19

drivers/media/i2c/imx290.c

+3 −3
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static int imx290_runtime_suspend(struct device *dev) 
}



static const struct dev_pm_ops imx290_pm_ops = {

	SET_RUNTIME_PM_OPS(imx290_runtime_suspend, imx290_runtime_resume, NULL)

	RUNTIME_PM_OPS(imx290_runtime_suspend, imx290_runtime_resume, NULL)

};



/* ----------------------------------------------------------------------------
@@ -1362,8 +1362,8 @@ static struct i2c_driver imx290_i2c_driver = { 
	.remove = imx290_remove,

	.driver = {

		.name  = "imx290",

		.pm = &imx290_pm_ops,

		.of_match_table = of_match_ptr(imx290_of_match),

		.pm = pm_ptr(&imx290_pm_ops),

		.of_match_table = imx290_of_match,

	},

};