Hi Tony, From: ext Tony Lindgren <tony@xxxxxxxxxxx> Subject: Re: [PATCH v2 3/4] omap: mailbox: fix reverse likeliness Date: Wed, 5 May 2010 17:21:35 +0200 > * Ohad Ben-Cohen <ohad@xxxxxxxxxx> [100504 04:42]: >> On Mon, May 3, 2010 at 9:02 PM, Tony Lindgren <tony@xxxxxxxxxxx> wrote: >> > * Ohad Ben-Cohen <ohad@xxxxxxxxxx> [100502 08:40]: >> >> Fix reverse likeliness >> >> >> >> Signed-off-by: Ohad Ben-Cohen <ohad@xxxxxxxxxx> >> >> --- >> >> If you want, you can also reach me at < ohadb at ti dot com >. >> >> >> >> arch/arm/plat-omap/mailbox.c | 4 ++-- >> >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> >> >> diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c >> >> index 5140efc..5309213 100644 >> >> --- a/arch/arm/plat-omap/mailbox.c >> >> +++ b/arch/arm/plat-omap/mailbox.c >> >> @@ -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 (likely(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 (likely(mbox->ops->shutdown)) { >> >> spin_lock(&mboxes_lock); >> >> if (mbox_configured > 0) >> >> mbox_configured--; >> > >> > Does this code path need to be optimized? :) >> > >> > How about just get rid of the (un)likely here? >> >> I like this :) >> >> If we're at it, there are additional cold-path (un)likely macros I >> want to target: > > Looks good to me. > > Hiroshi, care to ack/nak all the mailbox and iommu patches you want > me to merge? Or if you have them in some git branch against mainline > -rc6 that would be cool too. Feel free to add my ACK on them. Looks ok to me too. If there's more patches coming, I can consider to collect patches and to provide git branches for mailbox and iommu for next merge. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html