ALSA: hda - Constify fixup and other array data in patch_hdmi.c (fb79e1e0) · Commits · e / devices / android_kernel_oneplus_sm8150

sound/pci/hda/patch_hdmi.c

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ struct hdmi_spec {
	* ati/nvhdmi specific		* ati/nvhdmi specific
	*/		*/
	struct hda_multi_out multiout;		struct hda_multi_out multiout;
	struct hda_pcm_stream *pcm_playback;		const struct hda_pcm_stream *pcm_playback;

	/* misc flags */		/* misc flags */
	/* PD bit indicates only the update, not the current state */		/* PD bit indicates only the update, not the current state */
	@@ -1044,7 +1044,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
	return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format);		return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format);
	}		}

	static struct hda_pcm_stream generic_hdmi_pcm_playback = {		static const struct hda_pcm_stream generic_hdmi_pcm_playback = {
	.substreams = 1,		.substreams = 1,
	.channels_min = 2,		.channels_min = 2,
	.ops = {		.ops = {
	@@ -1124,7 +1124,7 @@ static void generic_hdmi_free(struct hda_codec *codec)
	kfree(spec);		kfree(spec);
	}		}

	static struct hda_codec_ops generic_hdmi_patch_ops = {		static const struct hda_codec_ops generic_hdmi_patch_ops = {
	.init = generic_hdmi_init,		.init = generic_hdmi_init,
	.free = generic_hdmi_free,		.free = generic_hdmi_free,
	.build_pcms = generic_hdmi_build_pcms,		.build_pcms = generic_hdmi_build_pcms,
	@@ -1169,12 +1169,12 @@ static int patch_generic_hdmi(struct hda_codec *codec)
	#define nvhdmi_master_con_nid_7x 0x04		#define nvhdmi_master_con_nid_7x 0x04
	#define nvhdmi_master_pin_nid_7x 0x05		#define nvhdmi_master_pin_nid_7x 0x05

	static hda_nid_t nvhdmi_con_nids_7x[4] = {		static const hda_nid_t nvhdmi_con_nids_7x[4] = {
	/front, rear, clfe, rear_surr /		/front, rear, clfe, rear_surr /
	0x6, 0x8, 0xa, 0xc,		0x6, 0x8, 0xa, 0xc,
	};		};

	static struct hda_verb nvhdmi_basic_init_7x[] = {		static const struct hda_verb nvhdmi_basic_init_7x[] = {
	/* set audio protect on */		/* set audio protect on */
	{ 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},		{ 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},
	/* enable digital output on pin widget */		/* enable digital output on pin widget */
	@@ -1435,7 +1435,7 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
	return 0;		return 0;
	}		}

	static struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = {		static const struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = {
	.substreams = 1,		.substreams = 1,
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 8,		.channels_max = 8,
	@@ -1450,7 +1450,7 @@ static struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = {
	},		},
	};		};

	static struct hda_pcm_stream nvhdmi_pcm_playback_2ch = {		static const struct hda_pcm_stream nvhdmi_pcm_playback_2ch = {
	.substreams = 1,		.substreams = 1,
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	@@ -1465,14 +1465,14 @@ static struct hda_pcm_stream nvhdmi_pcm_playback_2ch = {
	},		},
	};		};

	static struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {		static const struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {
	.build_controls = generic_hdmi_build_controls,		.build_controls = generic_hdmi_build_controls,
	.build_pcms = generic_hdmi_build_pcms,		.build_pcms = generic_hdmi_build_pcms,
	.init = nvhdmi_7x_init,		.init = nvhdmi_7x_init,
	.free = generic_hdmi_free,		.free = generic_hdmi_free,
	};		};

	static struct hda_codec_ops nvhdmi_patch_ops_2ch = {		static const struct hda_codec_ops nvhdmi_patch_ops_2ch = {
	.build_controls = generic_hdmi_build_controls,		.build_controls = generic_hdmi_build_controls,
	.build_pcms = generic_hdmi_build_pcms,		.build_pcms = generic_hdmi_build_pcms,
	.init = nvhdmi_7x_init,		.init = nvhdmi_7x_init,
	@@ -1568,7 +1568,7 @@ static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
	return 0;		return 0;
	}		}

	static struct hda_pcm_stream atihdmi_pcm_digital_playback = {		static const struct hda_pcm_stream atihdmi_pcm_digital_playback = {
	.substreams = 1,		.substreams = 1,
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	@@ -1580,7 +1580,7 @@ static struct hda_pcm_stream atihdmi_pcm_digital_playback = {
	},		},
	};		};

	static struct hda_verb atihdmi_basic_init[] = {		static const struct hda_verb atihdmi_basic_init[] = {
	/* enable digital output on pin widget */		/* enable digital output on pin widget */
	{ 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },		{ 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
	{} /* terminator */		{} /* terminator */
	@@ -1599,7 +1599,7 @@ static int atihdmi_init(struct hda_codec *codec)
	return 0;		return 0;
	}		}

	static struct hda_codec_ops atihdmi_patch_ops = {		static const struct hda_codec_ops atihdmi_patch_ops = {
	.build_controls = generic_hdmi_build_controls,		.build_controls = generic_hdmi_build_controls,
	.build_pcms = generic_hdmi_build_pcms,		.build_pcms = generic_hdmi_build_pcms,
	.init = atihdmi_init,		.init = atihdmi_init,
	@@ -1634,7 +1634,7 @@ static int patch_atihdmi(struct hda_codec *codec)
	/*		/*
	* patch entries		* patch entries
	*/		*/
	static struct hda_codec_preset snd_hda_preset_hdmi[] = {		static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
	{ .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },		{ .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },
	{ .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },		{ .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },
	{ .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },		{ .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },