omap: mailbox: trivial cleanups

Commit Message

Felipe Contreras May 2, 2010, 5:53 p.m. UTC

None

Patch

--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -406,21 +406,18 @@  static int __devinit omap2_mbox_probe(struct
platform_device *pdev)
                if (unlikely(!res)) {
                        dev_err(&pdev->dev, "invalid irq resource\n");
                        ret = -ENODEV;
-                       goto err_iva1;
+                       goto err_dsp;
                }
                mbox_iva_info.irq = res->start;
                ret = omap_mbox_register(&pdev->dev, &mbox_iva_info);
-               if (ret)
-                       goto err_iva1;
+               if (ret) {
+                       omap_mbox_unregister(&mbox_iva_info);
+                       goto err_dsp;
+               }
        }
 #endif
        return 0;

-#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
-err_iva1:
-       omap_mbox_unregister(&mbox_iva_info);
-#endif
-
 err_dsp:
        iounmap(mbox_base);