From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753510AbcGTIvc (ORCPT ); Wed, 20 Jul 2016 04:51:32 -0400 Received: from bear.ext.ti.com ([198.47.19.11]:47355 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753423AbcGTIv2 (ORCPT ); Wed, 20 Jul 2016 04:51:28 -0400 From: Peter Ujfalusi To: , CC: , , , , Subject: [PATCH v2 2/6] dmaengine: omap-dma: Simplify omap_dma_callback Date: Wed, 20 Jul 2016 11:50:28 +0300 Message-ID: <20160720085032.2955-3-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160720085032.2955-1-peter.ujfalusi@ti.com> References: <20160720085032.2955-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Flatten the indentation level of the function which gives better view on the cases we handle here. Signed-off-by: Peter Ujfalusi --- drivers/dma/omap-dma.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 7d56cd88c9a5..d469f9b820e0 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -445,15 +445,13 @@ static void omap_dma_callback(int ch, u16 status, void *data) spin_lock_irqsave(&c->vc.lock, flags); d = c->desc; if (d) { - if (!c->cyclic) { - if (c->sgidx < d->sglen) { - omap_dma_start_sg(c, d); - } else { - omap_dma_start_desc(c); - vchan_cookie_complete(&d->vd); - } - } else { + if (c->cyclic) { vchan_cyclic_callback(&d->vd); + } else if (c->sgidx == d->sglen) { + omap_dma_start_desc(c); + vchan_cookie_complete(&d->vd); + } else { + omap_dma_start_sg(c, d); } } spin_unlock_irqrestore(&c->vc.lock, flags); -- 2.9.2