diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-06-30 04:01:37 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-07-04 13:57:57 -0400 |
commit | 001eaa25ca8cf4bfdb76fa8f2287b8d34287b9b6 (patch) | |
tree | 51b3324ec8c092ba67bc3a2455a8716f695c85fb | |
parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) |
ASoC: s6000-i2s: Fix s6000_i2s_remove() return type
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>
-rw-r--r-- | sound/soc/s6000/s6000-i2s.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index 7eba7979b9af..1c8d01166e5b 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c | |||
@@ -570,7 +570,7 @@ err_release_none: | |||
570 | return ret; | 570 | return ret; |
571 | } | 571 | } |
572 | 572 | ||
573 | static void s6000_i2s_remove(struct platform_device *pdev) | 573 | static int s6000_i2s_remove(struct platform_device *pdev) |
574 | { | 574 | { |
575 | struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev); | 575 | struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev); |
576 | struct resource *region; | 576 | struct resource *region; |
@@ -597,6 +597,8 @@ static void s6000_i2s_remove(struct platform_device *pdev) | |||
597 | iounmap(mmio); | 597 | iounmap(mmio); |
598 | region = platform_get_resource(pdev, IORESOURCE_IO, 0); | 598 | region = platform_get_resource(pdev, IORESOURCE_IO, 0); |
599 | release_mem_region(region->start, resource_size(region)); | 599 | release_mem_region(region->start, resource_size(region)); |
600 | |||
601 | return 0; | ||
600 | } | 602 | } |
601 | 603 | ||
602 | static struct platform_driver s6000_i2s_driver = { | 604 | static struct platform_driver s6000_i2s_driver = { |