Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9bc8510 authored by Emil Goode's avatar Emil Goode Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarEmil Goode <emilgoode@gmail.com>
Acked-by: default avatarJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0d27bbfe

drivers/media/video/cx88/cx88-alsa.c

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = { 
 * Only boards with eeprom and byte 1 at eeprom=1 have it

 */



static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {

static const struct pci_device_id cx88_audio_pci_tbl[] __devinitdata = {

	{0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},

	{0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},

	{0, }

drivers/media/video/cx88/cx88-core.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf) 
 *    0x0c00 -           FIFOs

 */



const struct sram_channel const cx88_sram_channels[] = {

const struct sram_channel cx88_sram_channels[] = {

	[SRAM_CH21] = {

		.name       = "video y / packed",

		.cmds_start = 0x180040,

drivers/media/video/cx88/cx88.h

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ struct sram_channel { 
	u32  cnt1_reg;

	u32  cnt2_reg;

};

extern const struct sram_channel const cx88_sram_channels[];

extern const struct sram_channel cx88_sram_channels[];



/* ----------------------------------------------------------- */

/* card configuration                                          */