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

Commit ba4bc32e authored Jan 25, 2016 by Arnd Bergmann Committed by Mark Brown Jan 27, 2016

ASoC: s3c24xx: use const snd_soc_component_driver pointer

An older patch to convert the API in the s3c i2s driver
ended up passing a const pointer into a function that takes
a non-const pointer, so we now get a warning:

sound/soc/samsung/s3c2412-i2s.c: In function 's3c2412_iis_dev_probe':
sound/soc/samsung/s3c2412-i2s.c:172:9: error: passing argument 3 of 's3c_i2sv2_register_component' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

However, the s3c_i2sv2_register_component() function again
passes the pointer into another function taking a const, so
we just need to change its prototype.

Fixes: eca3b01d ("ASoC: switch over to use snd_soc_register_component() on s3c i2s")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 92e963f5

sound/soc/samsung/s3c-i2s-v2.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -709,7 +709,7 @@ static int s3c2412_i2s_resume(struct snd_soc_dai *dai)
	#endif		#endif

	int s3c_i2sv2_register_component(struct device *dev, int id,		int s3c_i2sv2_register_component(struct device *dev, int id,
	struct snd_soc_component_driver *cmp_drv,		const struct snd_soc_component_driver *cmp_drv,
	struct snd_soc_dai_driver *dai_drv)		struct snd_soc_dai_driver *dai_drv)
	{		{
	struct snd_soc_dai_ops ops = (struct snd_soc_dai_ops )dai_drv->ops;		struct snd_soc_dai_ops ops = (struct snd_soc_dai_ops )dai_drv->ops;

sound/soc/samsung/s3c-i2s-v2.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,7 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai,
	* soc core.		* soc core.
	*/		*/
	extern int s3c_i2sv2_register_component(struct device *dev, int id,		extern int s3c_i2sv2_register_component(struct device *dev, int id,
	struct snd_soc_component_driver *cmp_drv,		const struct snd_soc_component_driver *cmp_drv,
	struct snd_soc_dai_driver *dai_drv);		struct snd_soc_dai_driver *dai_drv);

	#endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */		#endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */