From patchwork Wed May 5 15:33:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 97137 X-Patchwork-Delegate: hiroshi.doyu@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o45FXsjJ016181 for ; Wed, 5 May 2010 15:33:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760584Ab0EEPdw (ORCPT ); Wed, 5 May 2010 11:33:52 -0400 Received: from fg-out-1718.google.com ([72.14.220.154]:5037 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760455Ab0EEPdv (ORCPT ); Wed, 5 May 2010 11:33:51 -0400 Received: by fg-out-1718.google.com with SMTP id d23so23396fga.1 for ; Wed, 05 May 2010 08:33:51 -0700 (PDT) Received: by 10.102.14.17 with SMTP id 17mr11247900mun.46.1273073630895; Wed, 05 May 2010 08:33:50 -0700 (PDT) Received: from localhost.localdomain (109-186-177-91.bb.netvision.net.il [109.186.177.91]) by mx.google.com with ESMTPS id s10sm30575248muh.5.2010.05.05.08.33.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 05 May 2010 08:33:50 -0700 (PDT) From: Ohad Ben-Cohen To: Cc: Kanigeri Hari , Hiroshi Doyu , Ohad Ben-Cohen Subject: [PATCH v3 3/4] omap: mailbox: remove (un)likely macros from cold paths Date: Wed, 5 May 2010 18:33:08 +0300 Message-Id: <1273073589-2485-4-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1273073589-2485-1-git-send-email-ohad@wizery.com> References: <1273073589-2485-1-git-send-email-ohad@wizery.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 05 May 2010 15:33:54 +0000 (UTC) diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index 5140efc..7c60550 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -248,12 +248,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) { spin_lock(&mboxes_lock); if (!mbox_configured) ret = mbox->ops->startup(mbox); - if (unlikely(ret)) { + if (ret) { spin_unlock(&mboxes_lock); return ret; } @@ -263,7 +263,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; @@ -290,7 +290,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; @@ -303,7 +303,7 @@ static void omap_mbox_fini(struct omap_mbox *mbox) free_irq(mbox->irq, mbox); - if (unlikely(mbox->ops->shutdown)) { + if (mbox->ops->shutdown) { spin_lock(&mboxes_lock); if (mbox_configured > 0) mbox_configured--;