media: i2c: imx290: fix conditional function defintions
PATCH 1/1 media: i2c: imx290: fix conditional function defintions
From: Arnd Bergmann <[email protected]>
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.
--- drivers/media/i2c/imx290.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/i2c/imx290.c +3 -3
@@ -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, }, };
Signature · 1 line
2.39.1
Hi Arnd,
Thank you for the patch.
Quoted 18 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The runtime suspend/resume functions are only referenced from the
dev_pm_ops, but they use the oldSET_RUNTIME_PM_OPS()helper that requires a__maybe_unusedannotation to avoid a warning:
drivers/media/i2c/imx290.c:1082:12: error: unused function 'imx290_runtime_resume' [-Werror,-Wunused-function] static intimx290_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 thepm_ptr()helper that lets thedev_pm_opsget dropped entirely whenCONFIG_PMis disabled.
Quoted 8 lines
A related mistake happened in the
of_match_ptr()macro here, which likeSET_RUNTIME_PM_OPS()requires the match table to be marked as__maybe_unused, though I could not reproduce building this withoutCONFIG_OF. Remove theof_match_ptr()here as there is no point in dropping the match table in configurations withoutCONFIG_OF.Fixes 02852c01f654 ("media: i2c: imx290: Initialize runtime PM before subdev")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 28 lines
--- drivers/media/i2c/imx290.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/media/i2c/imx290.c +3
-3@@ -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, }, };
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 7 lines · Laurent Pinchart
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The runtime suspend/resume functions are only referenced from the
dev_pm_ops, but they use the oldSET_RUNTIME_PM_OPS()helper that requires a__maybe_unusedannotation to avoid a warning:
Quoted 7 lines
Quoted 7 lines
drivers/media/i2c/imx290.c:1082:12: error: unused function 'imx290_runtime_resume' [-Werror,-Wunused-function] static intimx290_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) ^
I might be missing something (if so, please tell me), but to me it looks
this fix for a build issue in 6.3-rc (which shows up in Guenters weekly
reports to Linus) didn't make any progress in the past few weeks. Is there a reason why? Who actually needs to pick it up and send it towards mainline? Manivannan Sadhasivam? Sakari Ailus?
Ciao, Thorsten (wearing his 'the Linux kernel's regression tracker' hat) --
Everything you wanna know about Linux kernel regression tracking:
https://linux-regtracking.leemhuis.info/about/#tldr
If I did something stupid, please tell me, as explained on that page.
#regzbot poke
Quoted 45 lines
Quoted 5 lines
Convert this to the new
RUNTIME_PM_OPS()helper that so this is not required. To improve this further, also use thepm_ptr()helper that lets thedev_pm_opsget dropped entirely whenCONFIG_PMis disabled.Quoted 8 lines
A related mistake happened in the
of_match_ptr()macro here, which likeSET_RUNTIME_PM_OPS()requires the match table to be marked as__maybe_unused, though I could not reproduce building this withoutCONFIG_OF. Remove theof_match_ptr()here as there is no point in dropping the match table in configurations withoutCONFIG_OF.Fixes 02852c01f654 ("media: i2c: imx290: Initialize runtime PM before subdev")Signed-off-by Arnd Bergmann <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>Quoted 28 lines
--- drivers/media/i2c/imx290.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/media/i2c/imx290.c +3
-3@@ -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, }, };
Sakari Ailus
maintainerHello,
Quoted 16 lines · Linux regression tracking (Thorsten Leemhuis)
Quoted 7 lines · Laurent Pinchart
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The runtime suspend/resume functions are only referenced from the
dev_pm_ops, but they use the oldSET_RUNTIME_PM_OPS()helper that requires a__maybe_unusedannotation to avoid a warning:Quoted 7 lines
Quoted 7 lines
drivers/media/i2c/imx290.c:1082:12: error: unused function 'imx290_runtime_resume' [-Werror,-Wunused-function] static intimx290_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) ^
Quoted 5 lines
I might be missing something (if so, please tell me), but to me it looks
this fix for a build issue in 6.3-rc (which shows up in Guenters weekly
reports to Linus) didn't make any progress in the past few weeks. Is there a reason why? Who actually needs to pick it up and send it towards mainline? Manivannan Sadhasivam? Sakari Ailus?
Mauro has recently pulled my PR including this and I understand it's in Mauro's tree now.
Signature · 3 lines
Kind regards, Sakari Ailus
Quoted 17 lines · Sakari Ailus
Quoted 16 lines · Linux regression tracking (Thorsten Leemhuis)
Quoted 14 lines · Laurent Pinchart
Quoted 13 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The runtime suspend/resume functions are only referenced from the
dev_pm_ops, but they use the oldSET_RUNTIME_PM_OPS()helper that requires a__maybe_unusedannotation to avoid a warning:
drivers/media/i2c/imx290.c:1082:12: error: unused function 'imx290_runtime_resume' [-Werror,-Wunused-function] static intimx290_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) ^
Quoted 8 lines
Quoted 5 lines
I might be missing something (if so, please tell me), but to me it looks
this fix for a build issue in 6.3-rc (which shows up in Guenters weekly
reports to Linus) didn't make any progress in the past few weeks. Is there a reason why? Who actually needs to pick it up and send it towards mainline? Manivannan Sadhasivam? Sakari Ailus?Mauro has recently pulled my PR including this and I understand it's in Mauro's tree now.
Ahh, great, many thx.
I checked Linux-next before writing my mail, but didn't sport it there. :-/
Ciao, Thorsten
Quoted 24 lines · Linux regression tracking (Thorsten Leemhuis)
Quoted 23 lines · Sakari Ailus
Quoted 21 lines · Linux regression tracking (Thorsten Leemhuis)
Quoted 7 lines · Laurent Pinchart
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The runtime suspend/resume functions are only referenced from the
dev_pm_ops, but they use the oldSET_RUNTIME_PM_OPS()helper that requires a__maybe_unusedannotation to avoid a warning:Quoted 7 lines
Quoted 7 lines
drivers/media/i2c/imx290.c:1082:12: error: unused function 'imx290_runtime_resume' [-Werror,-Wunused-function] static intimx290_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) ^I might be missing something (if so, please tell me), but to me it looks
this fix for a build issue in 6.3-rc (which shows up in Guenters weekly
reports to Linus) didn't make any progress in the past few weeks. Is there a reason why? Who actually needs to pick it up and send it towards mainline? Manivannan Sadhasivam? Sakari Ailus?
Quoted 6 lines
Quoted 2 lines
Mauro has recently pulled my PR including this and I understand it's in Mauro's tree now.
Ahh, great, many thx.
I checked Linux-next before writing my mail, but didn't sport it there. :-/
Argh, ohh no, it's there. Sorry for the noise. Second time something like this happens today. Seems today is not my best day. :-/
Ciao, Thorsten
Sakari Ailus
maintainerQuoted 2 lines · Thorsten Leemhuis
Argh, ohh no, it's there. Sorry for the noise. Second time something like this happens today. Seems today is not my best day. :-/
No worries!
Signature · 1 line
Sakari Ailus
Quoted 18 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The runtime suspend/resume functions are only referenced from the
dev_pm_ops, but they use the oldSET_RUNTIME_PM_OPS()helper that requires a__maybe_unusedannotation to avoid a warning:
drivers/media/i2c/imx290.c:1082:12: error: unused function 'imx290_runtime_resume' [-Werror,-Wunused-function] static intimx290_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 thepm_ptr()helper that lets thedev_pm_opsget dropped entirely whenCONFIG_PMis disabled.
Quoted 8 lines
A related mistake happened in the
of_match_ptr()macro here, which likeSET_RUNTIME_PM_OPS()requires the match table to be marked as__maybe_unused, though I could not reproduce building this withoutCONFIG_OF. Remove theof_match_ptr()here as there is no point in dropping the match table in configurations withoutCONFIG_OF.Fixes 02852c01f654 ("media: i2c: imx290: Initialize runtime PM before subdev")Signed-off-by Arnd Bergmann <[email protected]>
Thanks,
Mani
Quoted 31 lines
--- drivers/media/i2c/imx290.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/media/i2c/imx290.c +3
-3@@ -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, }, };Signature · 1 line
2.39.1
Signature · 1 line
மணிவண்ணன் சதாசிவம்