Patch "[media] s5p-cec: mark PM functions as __maybe_unused again" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
[media] s5p-cec: mark PM functions as __maybe_unused again
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
s5p-cec-mark-pm-functions-as-__maybe_unused-again.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
eadf081146ec327d6fbbb6aff28e3d9aac329dc6Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Thu, 13 Oct 2016 11:39:04 -0300
Subject: [media] s5p-cec: mark PM functions as __maybe_unused again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Arnd Bergmann <[email protected]>
commit eadf081146ec327d6fbbb6aff28e3d9aac329dc6 upstream.
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.
--- drivers/staging/media/s5p-cec/s5p_cec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/s5p-cec/s5p_cec.c +2 -2
@@ -231,7 +231,7 @@ static int s5p_cec_remove(struct platforreturn 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(strucreturn 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;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/arm-ux500-fix-prcmu_is_cpu_in_wfi-calculation.patch queue-4.9/s5p-cec-mark-pm-functions-as-__maybe_unused-again.patch queue-4.9/ib-rxe-avoid-putting-a-large-struct-rxe_qp-on-stack.patch queue-4.9/platform-pxa_camera-add-video_v4l2-dependency.patch