Merge branch 'for-3.1' into for-3.2 (b42af319) · Commits · e / devices / android_kernel_xiaomi_nabu

sound/soc/codecs/wm8996.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -420,7 +420,7 @@ static const char *sidetone_hpf_text[] = {
	};		};

	static const struct soc_enum sidetone_hpf =		static const struct soc_enum sidetone_hpf =
	SOC_ENUM_SINGLE(WM8996_SIDETONE, 7, 6, sidetone_hpf_text);		SOC_ENUM_SINGLE(WM8996_SIDETONE, 7, 7, sidetone_hpf_text);

	static const char *hpf_mode_text[] = {		static const char *hpf_mode_text[] = {
	"HiFi", "Custom", "Voice"		"HiFi", "Custom", "Voice"

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -369,7 +369,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
	.pcm_free = &psc_dma_free,		.pcm_free = &psc_dma_free,
	};		};

	static int mpc5200_hpcd_probe(struct of_device *op)		static int mpc5200_hpcd_probe(struct platform_device *op)
	{		{
	phys_addr_t fifo;		phys_addr_t fifo;
	struct psc_dma *psc_dma;		struct psc_dma *psc_dma;
	@@ -487,7 +487,7 @@ static int mpc5200_hpcd_probe(struct of_device *op)
	return ret;		return ret;
	}		}

	static int mpc5200_hpcd_remove(struct of_device *op)		static int mpc5200_hpcd_remove(struct platform_device *op)
	{		{
	struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);		struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);

	@@ -519,7 +519,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
	static struct platform_driver mpc5200_hpcd_of_driver = {		static struct platform_driver mpc5200_hpcd_of_driver = {
	.probe = mpc5200_hpcd_probe,		.probe = mpc5200_hpcd_probe,
	.remove = mpc5200_hpcd_remove,		.remove = mpc5200_hpcd_remove,
	.dev = {		.driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "mpc5200-pcm-audio",		.name = "mpc5200-pcm-audio",
	.of_match_table = mpc5200_hpcd_match,		.of_match_table = mpc5200_hpcd_match,