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

Commit 50c697ad authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: Constify hw_constraints 



snd_pcm_hw_constraint_list(), *_ratnums() and *_ratdens() receive the
const pointers.  Constify the corresponding static objects for better
hardening.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 44d71507

sound/pci/hda/patch_hdmi.c

+5 −5
Original line number Diff line number Diff line
@@ -2782,21 +2782,21 @@ static int nvhdmi_7x_init_8ch(struct hda_codec *codec) 
	return 0;

}



static unsigned int channels_2_6_8[] = {

static const unsigned int channels_2_6_8[] = {

	2, 6, 8

};



static unsigned int channels_2_8[] = {

static const unsigned int channels_2_8[] = {

	2, 8

};



static struct snd_pcm_hw_constraint_list hw_constraints_2_6_8_channels = {

static const struct snd_pcm_hw_constraint_list hw_constraints_2_6_8_channels = {

	.count = ARRAY_SIZE(channels_2_6_8),

	.list = channels_2_6_8,

	.mask = 0,

};



static struct snd_pcm_hw_constraint_list hw_constraints_2_8_channels = {

static const struct snd_pcm_hw_constraint_list hw_constraints_2_8_channels = {

	.count = ARRAY_SIZE(channels_2_8),

	.list = channels_2_8,

	.mask = 0,
@@ -2807,7 +2807,7 @@ static int simple_playback_pcm_open(struct hda_pcm_stream *hinfo, 
				    struct snd_pcm_substream *substream)

{

	struct hdmi_spec *spec = codec->spec;

	struct snd_pcm_hw_constraint_list *hw_constraints_channels = NULL;

	const struct snd_pcm_hw_constraint_list *hw_constraints_channels = NULL;



	switch (codec->preset->vendor_id) {

	case 0x10de0002:

sound/pci/hda/patch_si3054.c

+2 −2
Original line number Diff line number Diff line
@@ -169,8 +169,8 @@ static int si3054_pcm_open(struct hda_pcm_stream *hinfo, 
			   struct hda_codec *codec,

			    struct snd_pcm_substream *substream)

{

	static unsigned int rates[] = { 8000, 9600, 16000 };

	static struct snd_pcm_hw_constraint_list hw_constraints_rates = {

	static const unsigned int rates[] = { 8000, 9600, 16000 };

	static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {

		.count = ARRAY_SIZE(rates),

		.list = rates,

		.mask = 0,