From patchwork Thu Nov 17 12:16:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanchayan X-Patchwork-Id: 9435171 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9AC1D60469 for ; Thu, 17 Nov 2016 18:50:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F1222968E for ; Thu, 17 Nov 2016 18:50:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8389329697; Thu, 17 Nov 2016 18:50:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37AE22968E for ; Thu, 17 Nov 2016 18:50:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754090AbcKQSu3 (ORCPT ); Thu, 17 Nov 2016 13:50:29 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36383 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754691AbcKQSu2 (ORCPT ); Thu, 17 Nov 2016 13:50:28 -0500 Received: by mail-pf0-f193.google.com with SMTP id c4so9459294pfb.3; Thu, 17 Nov 2016 10:50:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=rupibNIY54F8gPM1A30jDmLaYxeFI2QsPLB3jSIalio=; b=B+y/zNvauQPXaR3cOVY/+675Z4T3mrOV80dGjyCeIaCwo/zSbYSLKK3TP4p1QZy60A fxWNwhrSplgBKcOrXV5DmLzkB5sLf2aw2/P71jW+asFQWu2zBEU+WWCgtBw6qZ/FkHZd 1CBvqZBqKncG0ZTKNf9GKD8W2UCmhYcdDvlaDTLzwhcClsSmXpfE1HkVkEboth5jPzF3 ZLstrkakI0uhpWOjObwXKiEfHus6ULB0+HDl/Vq0OC3khqJ0GB0hVNCEUDWvdRCvtLA6 /KV0zkBKv0oHFj2uk5tIz+CxnZOlka1s15AgOszCyWGYx5hDQ9BE6RxucasHM128ht1S ytYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=rupibNIY54F8gPM1A30jDmLaYxeFI2QsPLB3jSIalio=; b=L9PIvMJ9/cqVVAuICdzANUBGKODdxovmMabQ88wawWlxNib3a5MpHxW7HXBJuv3lFp STK1G60QWqGJ6P9K9/3zzywh1hoOk1UWcXVS4nh6RUGtczIzSZGaioLe6JE3XwSSAO71 5kmg1zXCz2SgZGL4PS1/5dygsAApM5kclTkTOhdITsxtI577g2AMzyk884qBfLbtSsNl k0kk5P4cdbR3/F5W8My5GvD2xUy6ZrH1Rr6Of1VCV9qvTUrQXN/DMI1dFE9HKH52xNL/ Ko2omAKyPicxacIihrDTSWREqUEw+ydO/uqCfulKns+rLtGtdzdksaQ6ZsAiYwY0LcwD Wsmg== X-Gm-Message-State: ABUngvfvzxYMN/hwUSrlQCEutWQJCxljGWXuOPGt9okGVkFrv0FTIDgk8skzUrqEQcV3NQ== X-Received: by 10.99.115.82 with SMTP id d18mr7050175pgn.56.1479385562083; Thu, 17 Nov 2016 04:26:02 -0800 (PST) Received: from localhost ([115.115.243.34]) by smtp.gmail.com with ESMTPSA id 65sm7207969pfn.12.2016.11.17.04.26.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2016 04:26:01 -0800 (PST) From: Sanchayan Maity To: broonie@kernel.org Cc: stefan@agner.ch, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Sanchayan Maity Subject: [PATCH 4/4] spi: spi-fsl-dspi: Minor code cleanup and error path fixes Date: Thu, 17 Nov 2016 17:46:51 +0530 Message-Id: X-Mailer: git-send-email 2.10.2 In-Reply-To: References: <20161111122036.fubv7b4jc5vkdxhc@sirena.org.uk> In-Reply-To: References: Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Code cleanup for improving code readability and error path fixes and cleanup removing use of devm_kfree. Signed-off-by: Sanchayan Maity --- drivers/spi/spi-fsl-dspi.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 164e2e1..382a7f9 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -222,13 +222,18 @@ static void dspi_rx_dma_callback(void *arg) rx_word = is_double_byte_mode(dspi); - len = rx_word ? (dma->curr_xfer_len / 2) : dma->curr_xfer_len; + if (rx_word) + len = dma->curr_xfer_len / 2; + else + len = dma->curr_xfer_len; if (!(dspi->dataflags & TRAN_STATE_RX_VOID)) { for (i = 0; i < len; i++) { d = dspi->dma->rx_dma_buf[i]; - rx_word ? (*(u16 *)dspi->rx = d) : - (*(u8 *)dspi->rx = d); + if (rx_word) + *(u16 *)dspi->rx = d; + else + *(u8 *)dspi->rx = d; dspi->rx += rx_word + 1; } } @@ -247,17 +252,27 @@ static int dspi_next_xfer_dma_submit(struct fsl_dspi *dspi) tx_word = is_double_byte_mode(dspi); - len = tx_word ? (dma->curr_xfer_len / 2) : dma->curr_xfer_len; + if (tx_word) + len = dma->curr_xfer_len / 2; + else + len = dma->curr_xfer_len; for (i = 0; i < len - 1; i++) { - val = tx_word ? *(u16 *) dspi->tx : *(u8 *) dspi->tx; + if (tx_word) + val = *(u16 *) dspi->tx; + else + val = *(u8 *) dspi->tx; dspi->dma->tx_dma_buf[i] = SPI_PUSHR_TXDATA(val) | SPI_PUSHR_PCS(dspi->cs) | SPI_PUSHR_CTAS(0) | SPI_PUSHR_CONT; dspi->tx += tx_word + 1; } - val = tx_word ? *(u16 *) dspi->tx : *(u8 *) dspi->tx; + if (tx_word) + val = *(u16 *) dspi->tx; + else + val = *(u8 *) dspi->tx; + if (dspi->cs_change) { dspi->dma->tx_dma_buf[i] = SPI_PUSHR_TXDATA(val) | SPI_PUSHR_PCS(dspi->cs) | @@ -440,15 +455,16 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) return 0; err_slave_config: - devm_kfree(dev, dma->rx_dma_buf); + dma_free_coherent(dev, DSPI_DMA_BUFSIZE, + dma->rx_dma_buf, dma->rx_dma_phys); err_rx_dma_buf: - devm_kfree(dev, dma->tx_dma_buf); + dma_free_coherent(dev, DSPI_DMA_BUFSIZE, + dma->tx_dma_buf, dma->tx_dma_phys); err_tx_dma_buf: dma_release_channel(dma->chan_tx); err_tx_channel: dma_release_channel(dma->chan_rx); - devm_kfree(dev, dma); dspi->dma = NULL; return ret;