diff options
author | Emil Goode <emilgoode@gmail.com> | 2012-05-04 04:33:37 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-13 18:47:56 -0400 |
commit | d9bc8510c5fb55ce7092ebc928c0791e738ea5ae (patch) | |
tree | fdf1b7b5b3c6ca84b04260cff7bfdf8e11ceb14d /drivers/media | |
parent | 0d27bbfe81cb087748dc1511683bd3e7335a7da5 (diff) |
[media] cx88: Remove duplicate const
This patch fixes the following sparse warnings
by removing use of duplicate const.
drivers/media/video/cx88/cx88.h:152:40:
warning: duplicate const
drivers/media/video/cx88/cx88-core.c:256:33:
warning: duplicate const
drivers/media/video/cx88/cx88-alsa.c:769:41:
warning: duplicate const
As commented by Jonathan Nieder:
These double "const" were introduced in v2.6.37-rc1~64^2~464 (V4L/DVB:
drivers/media: Make static data tables and strings const, 2010-08-25).
The address of an array is already immutable by definition, so for
what it's worth, with or without a clarified commit message,
[mchehab@redhat.com: Tested with "gcc -s" (version 4.7.0):
the produced asm is indeed equal before and after this patch]
Signed-off-by: Emil Goode <emilgoode@gmail.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx88/cx88-alsa.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index dfac6e34859f..3aa6856ead3b 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
@@ -749,7 +749,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = { | |||
749 | * Only boards with eeprom and byte 1 at eeprom=1 have it | 749 | * Only boards with eeprom and byte 1 at eeprom=1 have it |
750 | */ | 750 | */ |
751 | 751 | ||
752 | static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = { | 752 | static const struct pci_device_id cx88_audio_pci_tbl[] __devinitdata = { |
753 | {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, | 753 | {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, |
754 | {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, | 754 | {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, |
755 | {0, } | 755 | {0, } |
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index e81c735f012a..c97b174be3ab 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -253,7 +253,7 @@ cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf) | |||
253 | * 0x0c00 - FIFOs | 253 | * 0x0c00 - FIFOs |
254 | */ | 254 | */ |
255 | 255 | ||
256 | const struct sram_channel const cx88_sram_channels[] = { | 256 | const struct sram_channel cx88_sram_channels[] = { |
257 | [SRAM_CH21] = { | 257 | [SRAM_CH21] = { |
258 | .name = "video y / packed", | 258 | .name = "video y / packed", |
259 | .cmds_start = 0x180040, | 259 | .cmds_start = 0x180040, |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 0cae0fd9e164..44ffc8b3d45f 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -141,7 +141,7 @@ struct sram_channel { | |||
141 | u32 cnt1_reg; | 141 | u32 cnt1_reg; |
142 | u32 cnt2_reg; | 142 | u32 cnt2_reg; |
143 | }; | 143 | }; |
144 | extern const struct sram_channel const cx88_sram_channels[]; | 144 | extern const struct sram_channel cx88_sram_channels[]; |
145 | 145 | ||
146 | /* ----------------------------------------------------------- */ | 146 | /* ----------------------------------------------------------- */ |
147 | /* card configuration */ | 147 | /* card configuration */ |