omap: mailbox: trivial cleanups (909f9dc7) · Commits · 戴 / test

arch/arm/mach-omap1/devices.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -73,12 +73,10 @@ static inline void omap_init_rtc(void) {}
		# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1
		#endif

		#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE

		static struct resource mbox_resources[] = {
		{
		.start = OMAP1_MBOX_BASE,
		.end = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,
		.start = OMAP16XX_MAILBOX_BASE,
		.end = OMAP16XX_MAILBOX_BASE + OMAP1_MBOX_SIZE,
		.flags = IORESOURCE_MEM,
		},
		{

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ static int omap1_mbox_fifo_full(struct omap_mbox *mbox)
		struct omap_mbox1_fifo *fifo =
		&((struct omap_mbox1_priv *)mbox->priv)->rx_fifo;

		return (mbox_read_reg(fifo->flag));
		return mbox_read_reg(fifo->flag);
		}

		/* irq */

+6 −4

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
		}

		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())
		l = OMAP4_SMARTIDLE;
		@@ -300,8 +300,6 @@ static struct omap_mbox2_priv omap2_mbox_dsp_priv = {
		.irqdisable = MAILBOX_IRQENABLE(0),
		};



		/* OMAP4 specific data structure. Use the cpu_is_omap4xxx()
		to use this*/
		static struct omap_mbox2_priv omap2_mbox_1_priv = {
		@@ -357,7 +355,6 @@ struct omap_mbox mbox_2_info = {
		};
		EXPORT_SYMBOL(mbox_2_info);


		#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
		static struct omap_mbox2_priv omap2_mbox_iva_priv = {
		.tx_fifo = {
		@@ -443,6 +440,11 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
		#endif
		return 0;

		#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
		err_iva1:
		omap_mbox_unregister(&mbox_dsp_info);
		#endif

		err_dsp:
		iounmap(mbox_base);
		return ret;