Skip to content

Commit

Permalink
ASoC: s6000-i2s: Fix s6000_i2s_remove() return type
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Jul 4, 2014
1 parent 7171511 commit 001eaa2
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion sound/soc/s6000/s6000-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ static int s6000_i2s_probe(struct platform_device *pdev)
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;
Expand All @@ -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 = {
Expand Down

0 comments on commit 001eaa2

Please sign in to comment.