From patchwork Fri May 21 21:44:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 101549 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 o4LLixes008445 for ; Fri, 21 May 2010 21:44:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753292Ab0EUVo6 (ORCPT ); Fri, 21 May 2010 17:44:58 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:40510 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753040Ab0EUVo5 (ORCPT ); Fri, 21 May 2010 17:44:57 -0400 Received: by fxm5 with SMTP id 5so1251271fxm.19 for ; Fri, 21 May 2010 14:44:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=C0TShVnp3skHf5eUZUC1zHy5BSZ0jv04re6ZD1RRbSI=; b=bWKjEJJB8d2woFhIYE9njcXpUKDMmfxpTpiks1cHJ3l3UvuXvcwNGAghqsln3+/VrA 0XMQpv4bxUcDuoCK76X4PMkdq6IOhzvaenYtGS94WZQOiQAKlzSXB7MxUKperQlhhlAy NnZM825k1UIbT8mkdQ/ZKDrx1hyFjHKrMRJ2c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=v3QtnLnvEYG5X3lzCibvTZL6CgYCO01rcAKdpOxD0DwXyFrRHgQR6/qrZqYT0aXg2z j8jmnWHrk461hyAjxuUCWamzWJzMRWw6f56FgXBF0kYl1kRO+ejCszI+nTZOrRe5DEzM fgoZjWBgPvz9ZNBXM5JnGk3ZT2y6UR14895Ys= Received: by 10.204.3.147 with SMTP id 19mr132840bkn.42.1274478296151; Fri, 21 May 2010 14:44:56 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id l1sm6256363bkl.8.2010.05.21.14.44.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 21 May 2010 14:44:55 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: linux-arm , Hiroshi Doyu , Tony Lindgren , Felipe Contreras Subject: [PATCH v2t2 01/17] omap: mailbox: trivial whitespace cleanups Date: Sat, 22 May 2010 00:44:33 +0300 Message-Id: <1274478289-22188-2-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274478289-22188-1-git-send-email-felipe.contreras@gmail.com> References: <1274478289-22188-1-git-send-email-felipe.contreras@gmail.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]); Fri, 21 May 2010 21:45:00 +0000 (UTC) diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index 36b3aa2..7877bbb 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -142,14 +142,14 @@ static void mbox_rx_work(struct work_struct *work) struct omap_mbox_queue *mq = container_of(work, struct omap_mbox_queue, work); mbox_msg_t msg; - int len; - - while (kfifo_len(&mq->fifo) >= sizeof(msg)) { - len = kfifo_out(&mq->fifo, (unsigned char *)&msg, sizeof(msg)); - WARN_ON(len != sizeof(msg)); - - if (mq->callback) - mq->callback((void *)msg); + int len; + + while (kfifo_len(&mq->fifo) >= sizeof(msg)) { + len = kfifo_out(&mq->fifo, (unsigned char *)&msg, sizeof(msg)); + WARN_ON(len != sizeof(msg)); + + if (mq->callback) + mq->callback((void *)msg); } } @@ -165,12 +165,12 @@ static void __mbox_tx_interrupt(struct omap_mbox *mbox) static void __mbox_rx_interrupt(struct omap_mbox *mbox) { - struct omap_mbox_queue *mq = mbox->rxq; + struct omap_mbox_queue *mq = mbox->rxq; mbox_msg_t msg; - int len; + int len; while (!mbox_fifo_empty(mbox)) { - if (unlikely(kfifo_avail(&mq->fifo) < sizeof(msg))) { + if (unlikely(kfifo_avail(&mq->fifo) < sizeof(msg))) { omap_mbox_disable_irq(mbox, IRQ_RX); rq_full = true; goto nomem; @@ -178,8 +178,8 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox) msg = mbox_fifo_read(mbox); - len = kfifo_in(&mq->fifo, (unsigned char *)&msg, sizeof(msg)); - WARN_ON(len != sizeof(msg)); + len = kfifo_in(&mq->fifo, (unsigned char *)&msg, sizeof(msg)); + WARN_ON(len != sizeof(msg)); if (mbox->ops->type == OMAP_MBOX_TYPE1) break; @@ -278,11 +278,11 @@ static int omap_mbox_startup(struct omap_mbox *mbox) return 0; - fail_alloc_rxq: +fail_alloc_rxq: mbox_queue_free(mbox->txq); - fail_alloc_txq: +fail_alloc_txq: free_irq(mbox->irq, mbox); - fail_request_irq: +fail_request_irq: if (mbox->ops->shutdown) mbox->ops->shutdown(mbox);