ASoC: s6000-i2s: Fix s6000_i2s_remove() return type
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 30 Jun 2014 08:01:37 +0000 (10:01 +0200)
committerMark Brown <broonie@linaro.org>
Fri, 4 Jul 2014 17:57:57 +0000 (18:57 +0100)
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>
sound/soc/s6000/s6000-i2s.c

index 7eba7979b9af606df34b2d40be1dceb8ef9a7964..1c8d01166e5bfdee80fd0209cb20f5357399f4f3 100644 (file)
@@ -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 = {