Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] C99 initializers, proper use of const in drivers/ps3
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Al Viro
and committed by
Linus Torvalds
dfdcbcc4
23f28001
+13
-11
+13
-11
drivers/ps3/ps3av_cmd.c
+13
-11
drivers/ps3/ps3av_cmd.c
···
485
485
486
486
static const u32 ps3av_ns_table[][5] = {
487
487
/* D1, D2, D3, D4, D5 */
488
-
[PS3AV_CMD_AUDIO_FS_44K-BASE] { 6272, 6272, 17836, 17836, 8918 },
489
-
[PS3AV_CMD_AUDIO_FS_48K-BASE] { 6144, 6144, 11648, 11648, 5824 },
490
-
[PS3AV_CMD_AUDIO_FS_88K-BASE] { 12544, 12544, 35672, 35672, 17836 },
491
-
[PS3AV_CMD_AUDIO_FS_96K-BASE] { 12288, 12288, 23296, 23296, 11648 },
492
-
[PS3AV_CMD_AUDIO_FS_176K-BASE] { 25088, 25088, 71344, 71344, 35672 },
493
-
[PS3AV_CMD_AUDIO_FS_192K-BASE] { 24576, 24576, 46592, 46592, 23296 }
488
+
[PS3AV_CMD_AUDIO_FS_44K-BASE] = { 6272, 6272, 17836, 17836, 8918 },
489
+
[PS3AV_CMD_AUDIO_FS_48K-BASE] = { 6144, 6144, 11648, 11648, 5824 },
490
+
[PS3AV_CMD_AUDIO_FS_88K-BASE] = { 12544, 12544, 35672, 35672, 17836 },
491
+
[PS3AV_CMD_AUDIO_FS_96K-BASE] = { 12288, 12288, 23296, 23296, 11648 },
492
+
[PS3AV_CMD_AUDIO_FS_176K-BASE] = { 25088, 25088, 71344, 71344, 35672 },
493
+
[PS3AV_CMD_AUDIO_FS_192K-BASE] = { 24576, 24576, 46592, 46592, 23296 }
494
494
};
495
495
496
496
static void ps3av_cnv_ns(u8 *ns, u32 fs, u32 video_vid)
···
543
543
544
544
#undef BASE
545
545
546
-
static u8 ps3av_cnv_enable(u32 source, u8 *enable)
546
+
static u8 ps3av_cnv_enable(u32 source, const u8 *enable)
547
547
{
548
-
u8 *p, ret = 0;
548
+
const u8 *p;
549
+
u8 ret = 0;
549
550
550
551
if (source == PS3AV_CMD_AUDIO_SOURCE_SPDIF) {
551
552
ret = 0x03;
···
560
559
return ret;
561
560
}
562
561
563
-
static u8 ps3av_cnv_fifomap(u8 *map)
562
+
static u8 ps3av_cnv_fifomap(const u8 *map)
564
563
{
565
-
u8 *p, ret = 0;
564
+
const u8 *p;
565
+
u8 ret = 0;
566
566
567
567
p = map;
568
568
ret = p[0] + (p[1] << 2) + (p[2] << 4) + (p[3] << 6);
···
617
615
info->pb5.lsv = mode->audio_downmix_level;
618
616
}
619
617
620
-
static void ps3av_cnv_chstat(u8 *chstat, u8 *cs_info)
618
+
static void ps3av_cnv_chstat(u8 *chstat, const u8 *cs_info)
621
619
{
622
620
memcpy(chstat, cs_info, 5);
623
621
}