diff mbox

[1/3] ASoC: s6000-i2s: Fix s6000_i2s_remove() return type

Message ID 1404115299-24109-1-git-send-email-lars@metafoo.de (mailing list archive)
State Accepted
Commit 001eaa25ca8cf4bfdb76fa8f2287b8d34287b9b6
Headers show

Commit Message

Lars-Peter Clausen June 30, 2014, 8:01 a.m. UTC 
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>
---
 sound/soc/s6000/s6000-i2s.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Mark Brown July 4, 2014, 5:58 p.m. UTC | #1 
On Mon, Jun 30, 2014 at 10:01:37AM +0200, Lars-Peter Clausen wrote:
> The platform_driver remove callback return type is int not void.

Applied all, thanks.
diff mbox

Patch

diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c
index 7eba797..1c8d011 100644
--- a/sound/soc/s6000/s6000-i2s.c
+++ b/sound/soc/s6000/s6000-i2s.c
@@ -570,7 +570,7 @@  err_release_none:
 	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 resource *region;
@@ -597,6 +597,8 @@  static void s6000_i2s_remove(struct platform_device *pdev)
 	iounmap(mmio);
 	region = platform_get_resource(pdev, IORESOURCE_IO, 0);
 	release_mem_region(region->start, resource_size(region));
+
+	return 0;
 }
 
 static struct platform_driver s6000_i2s_driver = {