diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-02-04 19:02:53 +0100 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-02-04 19:14:13 +0100 |
commit | 84d555aa74434392b682fd9eb0fa701c89a046d6 (patch) | |
tree | bcc0a9bf058757da14054bce61a8cb8b8c9cd873 /target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch | |
parent | 953973c2991e8640549a55df7a0574a1abac8644 (diff) | |
download | upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.tar.gz upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.tar.bz2 upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.zip |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch b/target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch new file mode 100644 index 0000000000..11e6f1fb1a --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0223-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch @@ -0,0 +1,41 @@ +From f658f48d662c5ecd84af235f47cc48636b9a55e2 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor <natechancellor@gmail.com> +Date: Thu, 27 Sep 2018 17:50:39 -0700 +Subject: [PATCH] staging: bcm2835-camera: Avoid unneeded internal + declaration warning + +Clang warns: + +drivers/staging/vc04_services/bcm2835-camera/controls.c:59:18: warning: +variable 'mains_freq_qmenu' is not needed and will not be emitted +[-Wunneeded-internal-declaration] +static const s64 mains_freq_qmenu[] = { + ^ +1 warning generated. + +This is because mains_freq_qmenu is currently only used in an ARRAY_SIZE +macro, which is a compile time evaluation in this case. Avoid this by +adding mains_freq_qmenu as the imenu member of this structure, which +matches all other controls that uses the ARRAY_SIZE macro in v4l2_ctrls. +This turns out to be a no-op because V4L2_CID_MPEG_VIDEO_BITRATE_MODE is +defined as a MMAL_CONTROL_TYPE_STD_MENU, which does not pass the imenu +definition along to v4l2_ctrl_new in bm2835_mmal_init_controls. + +Link: https://github.com/ClangBuiltLinux/linux/issues/122 +Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/staging/vc04_services/bcm2835-camera/controls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c ++++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c +@@ -1109,7 +1109,7 @@ static const struct bm2835_mmal_v4l2_ctr + { + V4L2_CID_POWER_LINE_FREQUENCY, MMAL_CONTROL_TYPE_STD_MENU, + 0, ARRAY_SIZE(mains_freq_qmenu) - 1, +- 1, 1, NULL, ++ 1, 1, mains_freq_qmenu, + MMAL_PARAMETER_FLICKER_AVOID, + &ctrl_set_flicker_avoidance, + false |