projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 8d8bb877 GKH |
1 | From d7e92e15e92fc987640772bf110586898b5f15aa Mon Sep 17 00:00:00 2001 |
| 2 | From: Arnd Bergmann <arnd@arndb.de> | |
| 3 | Date: Mon, 4 Jul 2016 10:21:40 -0300 | |
| 4 | Subject: [media] gspca: avoid unused variable warnings | |
| 5 | ||
| 6 | From: Arnd Bergmann <arnd@arndb.de> | |
| 7 | ||
| 8 | commit d7e92e15e92fc987640772bf110586898b5f15aa upstream. | |
| 9 | ||
| 10 | When CONFIG_INPUT is disabled, multiple gspca backend drivers | |
| 11 | print compile-time warnings about unused variables: | |
| 12 | ||
| 13 | media/usb/gspca/cpia1.c: In function 'sd_stopN': | |
| 14 | media/usb/gspca/cpia1.c:1627:13: error: unused variable 'sd' [-Werror=unused-variable] | |
| 15 | media/usb/gspca/konica.c: In function 'sd_stopN': | |
| 16 | media/usb/gspca/konica.c:246:13: error: unused variable 'sd' [-Werror=unused-variable] | |
| 17 | ||
| 18 | This annotates the variables as __maybe_unused, to let the compiler | |
| 19 | know that they are declared intentionally. | |
| 20 | ||
| 21 | Fixes: ee186fd96a5f ("[media] gscpa_t613: Add support for the camera button") | |
| 22 | Fixes: c2f644aeeba3 ("[media] gspca_cpia1: Add support for button") | |
| 23 | Fixes: b517af722860 ("V4L/DVB: gspca_konica: New gspca subdriver for konica chipset using cams") | |
| 24 | ||
| 25 | Signed-off-by: Arnd Bergmann <arnd@arndb.de> | |
| 26 | Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> | |
| 27 | Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> | |
| 28 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 29 | ||
| 30 | --- | |
| 31 | drivers/media/usb/gspca/cpia1.c | 2 +- | |
| 32 | drivers/media/usb/gspca/konica.c | 2 +- | |
| 33 | drivers/media/usb/gspca/t613.c | 2 +- | |
| 34 | 3 files changed, 3 insertions(+), 3 deletions(-) | |
| 35 | ||
| 36 | --- a/drivers/media/usb/gspca/cpia1.c | |
| 37 | +++ b/drivers/media/usb/gspca/cpia1.c | |
| 38 | @@ -1624,7 +1624,7 @@ static int sd_start(struct gspca_dev *gs | |
| 39 | ||
| 40 | static void sd_stopN(struct gspca_dev *gspca_dev) | |
| 41 | { | |
| 42 | - struct sd *sd = (struct sd *) gspca_dev; | |
| 43 | + struct sd *sd __maybe_unused = (struct sd *) gspca_dev; | |
| 44 | ||
| 45 | command_pause(gspca_dev); | |
| 46 | ||
| 47 | --- a/drivers/media/usb/gspca/konica.c | |
| 48 | +++ b/drivers/media/usb/gspca/konica.c | |
| 49 | @@ -243,7 +243,7 @@ static int sd_start(struct gspca_dev *gs | |
| 50 | ||
| 51 | static void sd_stopN(struct gspca_dev *gspca_dev) | |
| 52 | { | |
| 53 | - struct sd *sd = (struct sd *) gspca_dev; | |
| 54 | + struct sd *sd __maybe_unused = (struct sd *) gspca_dev; | |
| 55 | ||
| 56 | konica_stream_off(gspca_dev); | |
| 57 | #if IS_ENABLED(CONFIG_INPUT) | |
| 58 | --- a/drivers/media/usb/gspca/t613.c | |
| 59 | +++ b/drivers/media/usb/gspca/t613.c | |
| 60 | @@ -837,7 +837,7 @@ static void sd_pkt_scan(struct gspca_dev | |
| 61 | u8 *data, /* isoc packet */ | |
| 62 | int len) /* iso packet length */ | |
| 63 | { | |
| 64 | - struct sd *sd = (struct sd *) gspca_dev; | |
| 65 | + struct sd *sd __maybe_unused = (struct sd *) gspca_dev; | |
| 66 | int pkt_type; | |
| 67 | ||
| 68 | if (data[0] == 0x5a) { |