From patchwork Mon Nov 21 05:54:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanchayan X-Patchwork-Id: 9438787 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 ED092600BA for ; Mon, 21 Nov 2016 06:03:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFAB228984 for ; Mon, 21 Nov 2016 06:03:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE1A62898F; Mon, 21 Nov 2016 06:03:44 +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=ham 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 6A2B82898C for ; Mon, 21 Nov 2016 06:03:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753435AbcKUGDa (ORCPT ); Mon, 21 Nov 2016 01:03:30 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33950 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbcKUGD2 (ORCPT ); Mon, 21 Nov 2016 01:03:28 -0500 Received: by mail-pg0-f66.google.com with SMTP id e9so27187024pgc.1; Sun, 20 Nov 2016 22:03:22 -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=svRbHcDogjwSj3r19UYUrp2bE6m91RAxIxdl1VMAGSA=; b=lTLacfIFonGDRRw/uYnk6h/z2U/NQMwxDtVtNy7T3CKEiqQqed/0uTySeDt0m2qO+Y /MvVO6AodYLGr740ZVGkbM/fv3R2xEcDGwnmVokkOFN4nueKHI4vvqtibJwJOTTfD64f UzLKrVJYRzqugvIrzFLTQfSn1ua2/iYzRe2RDXzvLTFkcthqiWM7CZFYIJtxa4X6xpP3 7lEcv5dp4H5hsvi7p98c52rXf9swguhwRGcWuMHjLkfPVIkJ8JTduqZtfIR4i1BdldoQ 5f4QkxhT2u8UcnI6elvnBFZTS+801VR8n88YRKQp7lduQZmK0k/6mUAO9L9j7HxFsjtT xIjQ== 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=svRbHcDogjwSj3r19UYUrp2bE6m91RAxIxdl1VMAGSA=; b=Jv+VTkZuUz+ertowNOw5XxyFLs5f4y0FGOqKEiuN3NX6uTAq4dr1wS6CgLW47PL54b b99vY8YRo5EBZHdtqt7KTI3KZCZxrsltugDT7vWJJ+OIHe4Dm84e2VJczVlU0/riGQTc AJhbQbIF2eoFHx8Fe+y4Eal9vPXb8LkD4b9BFAzbkDfjQcFmB/QsGjUKWKj6mNBJ4LEI aMSgqaB9oOQDQy87Ob3m05GN36y0TbkzCxm3SxH4DrmTnWC6f01VVqQ9/4xQwxIevR9I HLvw9k185wb1AM5TIj4v4T8W72jMXxpD4wJJjYfEPYUx7MnBNAD145MWfS/jBPExg5M0 iV+Q== X-Gm-Message-State: AKaTC03/h/16gQmfAA0zfLoCDsAasHZO5xcVv9k1YhuwzzHvkL4cH1vo+EEaxLYoOLIdTg== X-Received: by 10.99.155.26 with SMTP id r26mr28437957pgd.165.1479708202302; Sun, 20 Nov 2016 22:03:22 -0800 (PST) Received: from localhost ([115.115.243.34]) by smtp.gmail.com with ESMTPSA id y89sm34011996pfk.83.2016.11.20.22.03.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Nov 2016 22:03:21 -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 v2 4/4] spi: spi-fsl-dspi: Minor code cleanup and error path fixes Date: Mon, 21 Nov 2016 11:24:04 +0530 Message-Id: <971874d8e662622c0cfe478adaa4c75b08388d0e.1479706671.git.maitysanchayan@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: References: 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 | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 08882f7..2987a16 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -226,8 +226,10 @@ static void dspi_rx_dma_callback(void *arg) if (!(dspi->dataflags & TRAN_STATE_RX_VOID)) { for (i = 0; i < dma->curr_xfer_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,14 +249,20 @@ static int dspi_next_xfer_dma_submit(struct fsl_dspi *dspi) tx_word = is_double_byte_mode(dspi); for (i = 0; i < dma->curr_xfer_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; dspi->dma->tx_dma_buf[i] = SPI_PUSHR_TXDATA(val) | SPI_PUSHR_PCS(dspi->cs) | SPI_PUSHR_CTAS(0); @@ -430,9 +438,11 @@ 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: