diff options
| author | Arnd Bergmann | 2016-10-13 16:39:04 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2016-11-16 16:04:47 +0100 |
| commit | eadf081146ec327d6fbbb6aff28e3d9aac329dc6 (patch) | |
| tree | 1172985f213aa7751f57a85dfd8ed135c336da84 /drivers/staging | |
| parent | [media] DaVinci-VPIF-Display: Delete an unnecessary variable initialisation i... (diff) | |
| download | kernel-qcow2-linux-eadf081146ec327d6fbbb6aff28e3d9aac329dc6.tar.gz kernel-qcow2-linux-eadf081146ec327d6fbbb6aff28e3d9aac329dc6.tar.xz kernel-qcow2-linux-eadf081146ec327d6fbbb6aff28e3d9aac329dc6.zip | |
[media] s5p-cec: mark PM functions as __maybe_unused again
A bugfix removed the two callers of s5p_cec_runtime_suspend
and s5p_cec_runtime_resume, leading to the return of a harmless
warning that I had previously fixed in commit aee8937089b1
("[media] s5p_cec: mark suspend/resume as __maybe_unused"):
staging/media/s5p-cec/s5p_cec.c:234:12: error: ‘s5p_cec_runtime_suspend’ defined but not used [-Werror=unused-function]
staging/media/s5p-cec/s5p_cec.c:242:12: error: ‘s5p_cec_runtime_resume’ defined but not used [-Werror=unused-function]
This adds the __maybe_unused annotations to the function that
were not removed and that are now unused when CONFIG_PM
is disabled.
Fixes: 57b978ada073 ("[media] s5p-cec: fix system and runtime PM integration")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/s5p-cec/s5p_cec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/staging/media/s5p-cec/s5p_cec.c index 1780a08b73c9..58d756231136 100644 --- a/drivers/staging/media/s5p-cec/s5p_cec.c +++ b/drivers/staging/media/s5p-cec/s5p_cec.c @@ -231,7 +231,7 @@ static int s5p_cec_remove(struct platform_device *pdev) return 0; } -static int s5p_cec_runtime_suspend(struct device *dev) +static int __maybe_unused s5p_cec_runtime_suspend(struct device *dev) { struct s5p_cec_dev *cec = dev_get_drvdata(dev); @@ -239,7 +239,7 @@ static int s5p_cec_runtime_suspend(struct device *dev) return 0; } -static int s5p_cec_runtime_resume(struct device *dev) +static int __maybe_unused s5p_cec_runtime_resume(struct device *dev) { struct s5p_cec_dev *cec = dev_get_drvdata(dev); int ret; |