mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-06 10:57:46 +00:00
Code Issues Releases Wiki Activity

omap: mailbox: remove (un)likely macros from cold paths

Browse source 
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
This commit is contained in:
Ohad Ben-Cohen 2010-05-05 15:33:08 +00:00 committed by Hiroshi DOYU
parent f375325a04
commit 01072d8f4b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/plat-omap/mailbox.c
View file

@ -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--;