@@ -287,8 +287,6 @@ struct omap_mbox mbox_dsp_info = {
};
EXPORT_SYMBOL(mbox_dsp_info);
-#if defined(CONFIG_ARCH_OMAP2420)
-
/* IVA */
static struct omap_mbox2_priv omap2_mbox_iva_priv = {
.tx_fifo = {
@@ -311,7 +309,6 @@ static struct omap_mbox mbox_iva_info = {
.ops = &omap2_mbox_ops,
.priv = &omap2_mbox_iva_priv,
};
-#endif
/* OMAP4 */
static struct omap_mbox2_priv omap2_mbox_1_priv = {
@@ -401,7 +398,6 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
goto err_dsp;
}
}
-#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
if (cpu_is_omap2420()) {
/* IVA IRQ */
res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
@@ -415,13 +411,10 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
if (ret)
goto err_iva1;
}
-#endif
return 0;
-#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
err_iva1:
omap_mbox_unregister(&mbox_dsp_info);
-#endif
err_dsp:
iounmap(mbox_base);
@@ -430,9 +423,8 @@ err_dsp:
static int __devexit omap2_mbox_remove(struct platform_device *pdev)
{
-#if defined(CONFIG_ARCH_OMAP2420)
- omap_mbox_unregister(&mbox_iva_info);
-#endif
+ if (cpu_is_omap2420())
+ omap_mbox_unregister(&mbox_iva_info);
if (cpu_is_omap44xx()) {
omap_mbox_unregister(&mbox_2_info);