diff options
| author | Felipe Balbi <felipe.balbi@nokia.com> | 2010-02-15 10:03:33 -0800 | 
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 10:03:33 -0800 | 
| commit | d761585a0571c9d508b26735a3d268ff3ec3a548 (patch) | |
| tree | 12e40fd9ed5835a14020f6352532f7f161ef9a56 /arch/arm/mach-omap1/mailbox.c | |
| parent | 96fbd74551e9cae8fd5e9cb62a0a19336a3064fa (diff) | |
| download | olio-linux-3.10-d761585a0571c9d508b26735a3d268ff3ec3a548.tar.xz olio-linux-3.10-d761585a0571c9d508b26735a3d268ff3ec3a548.zip  | |
omap1: mailbox: kill compile warning
use ioremap and remove unused variable to get rid
of compile warnings.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/mailbox.c')
| -rw-r--r-- | arch/arm/mach-omap1/mailbox.c | 9 | 
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c index caf889aaa24..4f5b3da3d55 100644 --- a/arch/arm/mach-omap1/mailbox.c +++ b/arch/arm/mach-omap1/mailbox.c @@ -146,7 +146,6 @@ EXPORT_SYMBOL(mbox_dsp_info);  static int __devinit omap1_mbox_probe(struct platform_device *pdev)  {  	struct resource *res; -	int ret = 0;  	if (pdev->num_resources != 2) {  		dev_err(&pdev->dev, "invalid number of resources: %d\n", @@ -160,12 +159,18 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev)  		dev_err(&pdev->dev, "invalid mem resource\n");  		return -ENODEV;  	} -	mbox_base = res->start; + +	mbox_base = ioremap(res->start, resource_size(res)); +	if (!mbox_base) { +		dev_err(&pdev->dev, "ioremap failed\n"); +		return -ENODEV; +	}  	/* DSP IRQ */  	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);  	if (unlikely(!res)) {  		dev_err(&pdev->dev, "invalid irq resource\n"); +		iounmap(mbox_base);  		return -ENODEV;  	}  	mbox_dsp_info.irq = res->start;  |