Signed-off-by: Felipe Contreras <[email protected]>
---

Hiroshi: I think there's something wrong with your editor =/

 arch/arm/plat-omap/mailbox.c |   44 +++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 36b3aa2..38a6cb1 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);
 
@@ -359,10 +359,10 @@ int omap_mbox_register(struct device *parent, struct 
omap_mbox *mbox)
        if (mbox->next)
                return -EBUSY;
 
-       mbox->dev = device_create(&omap_mbox_class,
-                                 parent, 0, mbox, "%s", mbox->name);
-       if (IS_ERR(mbox->dev))
-               return PTR_ERR(mbox->dev);
+       mbox->dev = device_create(&omap_mbox_class,
+                                 parent, 0, mbox, "%s", mbox->name);
+       if (IS_ERR(mbox->dev))
+               return PTR_ERR(mbox->dev);
 
        spin_lock(&mboxes_lock);
        tmp = find_mboxes(mbox->name);
@@ -405,7 +405,7 @@ EXPORT_SYMBOL(omap_mbox_unregister);
 
 static int __init omap_mbox_init(void)
 {
-       int err;
+       int err;
 
        err = class_register(&omap_mbox_class);
        if (err)
@@ -426,7 +426,7 @@ subsys_initcall(omap_mbox_init);
 static void __exit omap_mbox_exit(void)
 {
        destroy_workqueue(mboxd);
-       class_unregister(&omap_mbox_class);
+       class_unregister(&omap_mbox_class);
 }
 module_exit(omap_mbox_exit);
 
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to