diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-04-06 15:37:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-15 15:30:53 -0700 |
| commit | 0f18a27787a340b26c4f64fae8f2bb103f50b546 (patch) | |
| tree | b9ab5f3705033cde6f3cedbd8715fa684de2d2b2 /drivers | |
| parent | dbdb85221af150e8ef570c333cb4729a98cc82c8 (diff) | |
| download | linux-0f18a27787a340b26c4f64fae8f2bb103f50b546.tar.bz2 | |
staging: rts5139: Make variables inside #ifdef CONFIG_PM
If CONFIG_PM=n:
drivers/staging/rts5139/rts51x_transport.c:649: warning: ‘media_not_present’ defined but not used
drivers/staging/rts5139/rts51x_transport.c:651: warning: ‘invalid_cmd_field’ defined but not used
Move the variables inside the #ifdef CONFIG_PM, and make them const while
we're at it.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rts5139/rts51x_transport.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/staging/rts5139/rts51x_transport.c b/drivers/staging/rts5139/rts51x_transport.c index 74588d249b32..0db1345df94e 100644 --- a/drivers/staging/rts5139/rts51x_transport.c +++ b/drivers/staging/rts5139/rts51x_transport.c @@ -646,16 +646,18 @@ int rts51x_get_epc_status(struct rts51x_chip *chip, u16 *status) chip->usb->intr_urb->actual_length); } -static u8 media_not_present[] = { - 0x70, 0, 0x02, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0x3A, 0, 0, 0, 0, 0 }; -static u8 invalid_cmd_field[] = { - 0x70, 0, 0x05, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0x24, 0, 0, 0, 0, 0 }; - void rts51x_invoke_transport(struct scsi_cmnd *srb, struct rts51x_chip *chip) { int result; #ifdef CONFIG_PM + static const u8 media_not_present[] = { + 0x70, 0, 0x02, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0x3A, 0, 0, 0, 0, 0 + }; + static const u8 invalid_cmd_field[] = { + 0x70, 0, 0x05, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0x24, 0, 0, 0, 0, 0 + }; + if (chip->option.ss_en) { if (srb->cmnd[0] == TEST_UNIT_READY) { if (RTS51X_CHK_STAT(chip, STAT_SS)) { |