evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: s6000-i2s: Fix s6000_i2s_remove() return type

Browse source 
The platform_driver remove callback return type is int not void.

Fixes the following warning:
	sound/soc/s6000/s6000-i2s.c:604:19: warning: incorrect type in initializer (different base types)
	sound/soc/s6000/s6000-i2s.c:604:19:    expected int ( *remove )( ... )
	sound/soc/s6000/s6000-i2s.c:604:19:    got void ( static [toplevel] *<noident>)( ... )

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Lars-Peter Clausen 2014-06-30 10:01:37 +02:00 • committed by Mark Brown
parent 7171511eae
commit 001eaa25ca
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/soc/s6000/s6000-i2s.c
View file

@ -570,7 +570,7 @@ err_release_none:
return ret; return ret;
} }
static void s6000_i2s_remove(struct platform_device *pdev) static int s6000_i2s_remove(struct platform_device *pdev)
{ {
struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev); struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev);
struct resource *region; struct resource *region;
@ -597,6 +597,8 @@ static void s6000_i2s_remove(struct platform_device *pdev)
iounmap(mmio); iounmap(mmio);
region = platform_get_resource(pdev, IORESOURCE_IO, 0); region = platform_get_resource(pdev, IORESOURCE_IO, 0);
release_mem_region(region->start, resource_size(region)); release_mem_region(region->start, resource_size(region));
return 0;
} }
static struct platform_driver s6000_i2s_driver = { static struct platform_driver s6000_i2s_driver = {