* [PATCH 0/2] omap1 mailbox compile warning removal @ 2009-12-22 20:15 Felipe Balbi 2009-12-22 20:15 ` [PATCH 1/2] arm: omap1: mailbox: kill compile warning Felipe Balbi 2009-12-22 20:15 ` [PATCH 2/2] " Felipe Balbi 0 siblings, 2 replies; 7+ messages in thread From: Felipe Balbi @ 2009-12-22 20:15 UTC (permalink / raw) To: Linux OMAP Mailing List; +Cc: Tony Lindgren, Hiroshi DOYU, Felipe Balbi Remove two compile warnings from mailbox.c Felipe Balbi (2): arm: omap1: mailbox: kill compile warning arm: omap1: mailbox: kill compile warning arch/arm/mach-omap1/mailbox.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] arm: omap1: mailbox: kill compile warning 2009-12-22 20:15 [PATCH 0/2] omap1 mailbox compile warning removal Felipe Balbi @ 2009-12-22 20:15 ` Felipe Balbi 2009-12-29 0:26 ` Tony Lindgren 2009-12-22 20:15 ` [PATCH 2/2] " Felipe Balbi 1 sibling, 1 reply; 7+ messages in thread From: Felipe Balbi @ 2009-12-22 20:15 UTC (permalink / raw) To: Linux OMAP Mailing List; +Cc: Tony Lindgren, Hiroshi DOYU, Felipe Balbi use ioremap to get the virtual address and avoid a compile warning. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> --- arch/arm/mach-omap1/mailbox.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c index caf889a..38a7d2c 100644 --- a/arch/arm/mach-omap1/mailbox.c +++ b/arch/arm/mach-omap1/mailbox.c @@ -160,7 +160,12 @@ 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); -- 1.6.6.rc0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] arm: omap1: mailbox: kill compile warning 2009-12-22 20:15 ` [PATCH 1/2] arm: omap1: mailbox: kill compile warning Felipe Balbi @ 2009-12-29 0:26 ` Tony Lindgren 2009-12-29 0:59 ` [PATCH v2] " Felipe Balbi 0 siblings, 1 reply; 7+ messages in thread From: Tony Lindgren @ 2009-12-29 0:26 UTC (permalink / raw) To: Felipe Balbi; +Cc: Linux OMAP Mailing List, Hiroshi DOYU * Felipe Balbi <felipe.balbi@nokia.com> [091222 12:17]: > use ioremap to get the virtual address and > avoid a compile warning. > > Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> > --- > arch/arm/mach-omap1/mailbox.c | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c > index caf889a..38a7d2c 100644 > --- a/arch/arm/mach-omap1/mailbox.c > +++ b/arch/arm/mach-omap1/mailbox.c > @@ -160,7 +160,12 @@ 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); This does not look right, if you look at mach-omap1/devices.c, OMAP1_MBOX_BASE is still using OMAP1_IO_ADDRESS, so it's already a virt address. Maybe update the patch to remove OMAP1_IO_ADDRESS in mach-omap1/devices.c? Regards, Tony ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] arm: omap1: mailbox: kill compile warning 2009-12-29 0:26 ` Tony Lindgren @ 2009-12-29 0:59 ` Felipe Balbi 2009-12-29 12:56 ` Felipe Balbi 0 siblings, 1 reply; 7+ messages in thread From: Felipe Balbi @ 2009-12-29 0:59 UTC (permalink / raw) To: tony; +Cc: linux-omap, Hiroshi DOYU, Felipe Balbi remove unused variable and kill compile warning. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> --- Changes from previous version: - Removed OMAP1_IO_ADDRESS() from OMAP1_MBOX_BASE define arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/mailbox.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 23ded2d..9caf51b 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -71,7 +71,7 @@ static inline void omap_init_rtc(void) {} # define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1 #endif -#define OMAP1_MBOX_BASE OMAP1_IO_ADDRESS(OMAP16XX_MAILBOX_BASE) +#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE static struct resource mbox_resources[] = { { diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c index caf889a..a4dd4c0 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", -- 1.6.6.35.g1d85d ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] arm: omap1: mailbox: kill compile warning 2009-12-29 0:59 ` [PATCH v2] " Felipe Balbi @ 2009-12-29 12:56 ` Felipe Balbi 2009-12-29 13:04 ` [PATCH] " Felipe Balbi 0 siblings, 1 reply; 7+ messages in thread From: Felipe Balbi @ 2009-12-29 12:56 UTC (permalink / raw) To: Balbi Felipe (Nokia-D/Helsinki) Cc: tony@atomide.com, linux-omap@vger.kernel.org, Doyu Hiroshi (Nokia-D/Helsinki) On Tue, Dec 29, 2009 at 01:59:12AM +0100, Balbi Felipe (Nokia-D/Helsinki) wrote: >remove unused variable and kill compile warning. > >Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> >--- > >Changes from previous version: > - Removed OMAP1_IO_ADDRESS() from OMAP1_MBOX_BASE define forget this one. -- balbi ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] arm: omap1: mailbox: kill compile warning 2009-12-29 12:56 ` Felipe Balbi @ 2009-12-29 13:04 ` Felipe Balbi 0 siblings, 0 replies; 7+ messages in thread From: Felipe Balbi @ 2009-12-29 13:04 UTC (permalink / raw) To: tony; +Cc: linux-omap, Felipe Balbi use ioremap and remove unused variable to get rid of compile warnings. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> --- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/mailbox.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 23ded2d..9caf51b 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -71,7 +71,7 @@ static inline void omap_init_rtc(void) {} # define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1 #endif -#define OMAP1_MBOX_BASE OMAP1_IO_ADDRESS(OMAP16XX_MAILBOX_BASE) +#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE static struct resource mbox_resources[] = { { diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c index caf889a..4f5b3da 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; -- 1.6.6.rc0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] arm: omap1: mailbox: kill compile warning 2009-12-22 20:15 [PATCH 0/2] omap1 mailbox compile warning removal Felipe Balbi 2009-12-22 20:15 ` [PATCH 1/2] arm: omap1: mailbox: kill compile warning Felipe Balbi @ 2009-12-22 20:15 ` Felipe Balbi 1 sibling, 0 replies; 7+ messages in thread From: Felipe Balbi @ 2009-12-22 20:15 UTC (permalink / raw) To: Linux OMAP Mailing List; +Cc: Tony Lindgren, Hiroshi DOYU, Felipe Balbi remove unused variable and kill compile warning. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> --- arch/arm/mach-omap1/mailbox.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c index 38a7d2c..3fcce3d 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", -- 1.6.6.rc0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-12-29 13:06 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-12-22 20:15 [PATCH 0/2] omap1 mailbox compile warning removal Felipe Balbi 2009-12-22 20:15 ` [PATCH 1/2] arm: omap1: mailbox: kill compile warning Felipe Balbi 2009-12-29 0:26 ` Tony Lindgren 2009-12-29 0:59 ` [PATCH v2] " Felipe Balbi 2009-12-29 12:56 ` Felipe Balbi 2009-12-29 13:04 ` [PATCH] " Felipe Balbi 2009-12-22 20:15 ` [PATCH 2/2] " Felipe Balbi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox