omap: mailbox: remove (un)likely macros from cold paths (01072d8f) · Commits · 戴 / test

arch/arm/plat-omap/mailbox.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -258,12 +258,12 @@ static int omap_mbox_startup(struct omap_mbox *mbox)
		int ret = 0;
		struct omap_mbox_queue *mq;

		if (likely(mbox->ops->startup)) {
		if (mbox->ops->startup) {
		mutex_lock(&mbox_configured_lock);
		if (!mbox_configured)
		ret = mbox->ops->startup(mbox);

		if (unlikely(ret)) {
		if (ret) {
		mutex_unlock(&mbox_configured_lock);
		return ret;
		}
		@@ -273,7 +273,7 @@ static int omap_mbox_startup(struct omap_mbox *mbox)

		ret = request_irq(mbox->irq, mbox_interrupt, IRQF_SHARED,
		mbox->name, mbox);
		if (unlikely(ret)) {
		if (ret) {
		printk(KERN_ERR
		"failed to register mailbox interrupt:%d\n", ret);
		goto fail_request_irq;
		@@ -300,7 +300,7 @@ static int omap_mbox_startup(struct omap_mbox *mbox)
		fail_alloc_txq:
		free_irq(mbox->irq, mbox);
		fail_request_irq:
		if (unlikely(mbox->ops->shutdown))
		if (mbox->ops->shutdown)
		mbox->ops->shutdown(mbox);

		return ret;
		@@ -314,7 +314,7 @@ static void omap_mbox_fini(struct omap_mbox *mbox)
		mbox_queue_free(mbox->txq);
		mbox_queue_free(mbox->rxq);

		if (unlikely(mbox->ops->shutdown)) {
		if (mbox->ops->shutdown) {
		mutex_lock(&mbox_configured_lock);
		if (mbox_configured > 0)
		mbox_configured--;