UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

omap: mailbox: trivial cleanups 

And fix a few compilation warnings.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
This commit is contained in:
Felipe Contreras 2010-06-11 15:51:37 +00:00 committed by Hiroshi DOYU
parent 6b23398591
commit 909f9dc71e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-omap1/devices.c
View File

@ -73,12 +73,10 @@ static inline void omap_init_rtc(void) {}
# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1 # define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1
#endif #endif
#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE
static struct resource mbox_resources[] = { static struct resource mbox_resources[] = {
{ {
.start = OMAP1_MBOX_BASE, .start = OMAP16XX_MAILBOX_BASE,
.end = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE, .end = OMAP16XX_MAILBOX_BASE + OMAP1_MBOX_SIZE,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {

2
arch/arm/mach-omap1/mailbox.c
View File

@ -83,7 +83,7 @@ static int omap1_mbox_fifo_full(struct omap_mbox *mbox)
struct omap_mbox1_fifo *fifo = struct omap_mbox1_fifo *fifo =
&((struct omap_mbox1_priv *)mbox->priv)->rx_fifo; &((struct omap_mbox1_priv *)mbox->priv)->rx_fifo;
return (mbox_read_reg(fifo->flag)); return mbox_read_reg(fifo->flag);
} }
/* irq */ /* irq */

10
arch/arm/mach-omap2/mailbox.c
View File

@ -131,7 +131,7 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
} }
l = mbox_read_reg(MAILBOX_REVISION); l = mbox_read_reg(MAILBOX_REVISION);
pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f)); pr_debug("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f));
if (cpu_is_omap44xx()) if (cpu_is_omap44xx())
l = OMAP4_SMARTIDLE; l = OMAP4_SMARTIDLE;
@ -300,8 +300,6 @@ static struct omap_mbox2_priv omap2_mbox_dsp_priv = {
.irqdisable = MAILBOX_IRQENABLE(0), .irqdisable = MAILBOX_IRQENABLE(0),
}; };
/* OMAP4 specific data structure. Use the cpu_is_omap4xxx() /* OMAP4 specific data structure. Use the cpu_is_omap4xxx()
to use this*/ to use this*/
static struct omap_mbox2_priv omap2_mbox_1_priv = { static struct omap_mbox2_priv omap2_mbox_1_priv = {
@ -357,7 +355,6 @@ struct omap_mbox mbox_2_info = {
}; };
EXPORT_SYMBOL(mbox_2_info); EXPORT_SYMBOL(mbox_2_info);
#if defined(CONFIG_ARCH_OMAP2420) /* IVA */ #if defined(CONFIG_ARCH_OMAP2420) /* IVA */
static struct omap_mbox2_priv omap2_mbox_iva_priv = { static struct omap_mbox2_priv omap2_mbox_iva_priv = {
.tx_fifo = { .tx_fifo = {
@ -443,6 +440,11 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
#endif #endif
return 0; return 0;
#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
err_iva1:
omap_mbox_unregister(&mbox_dsp_info);
#endif
err_dsp: err_dsp:
iounmap(mbox_base); iounmap(mbox_base);
return ret; return ret;