| From d7e92e15e92fc987640772bf110586898b5f15aa Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Mon, 4 Jul 2016 10:21:40 -0300 |
| Subject: [media] gspca: avoid unused variable warnings |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit d7e92e15e92fc987640772bf110586898b5f15aa upstream. |
| |
| When CONFIG_INPUT is disabled, multiple gspca backend drivers |
| print compile-time warnings about unused variables: |
| |
| media/usb/gspca/cpia1.c: In function 'sd_stopN': |
| media/usb/gspca/cpia1.c:1627:13: error: unused variable 'sd' [-Werror=unused-variable] |
| media/usb/gspca/konica.c: In function 'sd_stopN': |
| media/usb/gspca/konica.c:246:13: error: unused variable 'sd' [-Werror=unused-variable] |
| |
| This annotates the variables as __maybe_unused, to let the compiler |
| know that they are declared intentionally. |
| |
| Fixes: ee186fd96a5f ("[media] gscpa_t613: Add support for the camera button") |
| Fixes: c2f644aeeba3 ("[media] gspca_cpia1: Add support for button") |
| Fixes: b517af722860 ("V4L/DVB: gspca_konica: New gspca subdriver for konica chipset using cams") |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/usb/gspca/cpia1.c | 2 +- |
| drivers/media/usb/gspca/konica.c | 2 +- |
| drivers/media/usb/gspca/t613.c | 2 +- |
| 3 files changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/media/usb/gspca/cpia1.c |
| +++ b/drivers/media/usb/gspca/cpia1.c |
| @@ -1624,7 +1624,7 @@ static int sd_start(struct gspca_dev *gs |
| |
| static void sd_stopN(struct gspca_dev *gspca_dev) |
| { |
| - struct sd *sd = (struct sd *) gspca_dev; |
| + struct sd *sd __maybe_unused = (struct sd *) gspca_dev; |
| |
| command_pause(gspca_dev); |
| |
| --- a/drivers/media/usb/gspca/konica.c |
| +++ b/drivers/media/usb/gspca/konica.c |
| @@ -243,7 +243,7 @@ static int sd_start(struct gspca_dev *gs |
| |
| static void sd_stopN(struct gspca_dev *gspca_dev) |
| { |
| - struct sd *sd = (struct sd *) gspca_dev; |
| + struct sd *sd __maybe_unused = (struct sd *) gspca_dev; |
| |
| konica_stream_off(gspca_dev); |
| #if IS_ENABLED(CONFIG_INPUT) |
| --- a/drivers/media/usb/gspca/t613.c |
| +++ b/drivers/media/usb/gspca/t613.c |
| @@ -837,7 +837,7 @@ static void sd_pkt_scan(struct gspca_dev |
| u8 *data, /* isoc packet */ |
| int len) /* iso packet length */ |
| { |
| - struct sd *sd = (struct sd *) gspca_dev; |
| + struct sd *sd __maybe_unused = (struct sd *) gspca_dev; |
| int pkt_type; |
| |
| if (data[0] == 0x5a) { |
