From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752837AbcKVGVY (ORCPT ); Tue, 22 Nov 2016 01:21:24 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35777 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752168AbcKVGVX (ORCPT ); Tue, 22 Nov 2016 01:21:23 -0500 Date: Tue, 22 Nov 2016 11:42:23 +0530 From: maitysanchayan@gmail.com To: Stefan Agner Cc: broonie@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: Re: [PATCH v2 4/4] spi: spi-fsl-dspi: Minor code cleanup and error path fixes Message-ID: <20161122061222.GB2484@Sanchayan-Arch.localdomain> References: <971874d8e662622c0cfe478adaa4c75b08388d0e.1479706671.git.maitysanchayan@gmail.com> <43b518a92352986f09b0893646ff8016@agner.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <43b518a92352986f09b0893646ff8016@agner.ch> User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 16-11-21 15:22:09, Stefan Agner wrote: > On 2016-11-20 21:54, Sanchayan Maity wrote: > > Code cleanup for improving code readability and error path fixes > > and cleanup removing use of devm_kfree. > > Two things in one, not very nice. Especially the dma_free_coherent is > really a bug and the other is a cleanup. Can you make a separate patch > for the bug? > > As for the cleanup, I don't like the one line conditions too, but I > don't think it is worth a patch. At least the TX path should be solved > with my suggestion in patch 2. Agreed. - Sanchayan. > > -- > Stefan > > > > > 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: From mboxrd@z Thu Jan 1 00:00:00 1970 From: maitysanchayan@gmail.com (maitysanchayan at gmail.com) Date: Tue, 22 Nov 2016 11:42:23 +0530 Subject: [PATCH v2 4/4] spi: spi-fsl-dspi: Minor code cleanup and error path fixes In-Reply-To: <43b518a92352986f09b0893646ff8016@agner.ch> References: <971874d8e662622c0cfe478adaa4c75b08388d0e.1479706671.git.maitysanchayan@gmail.com> <43b518a92352986f09b0893646ff8016@agner.ch> Message-ID: <20161122061222.GB2484@Sanchayan-Arch.localdomain> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 16-11-21 15:22:09, Stefan Agner wrote: > On 2016-11-20 21:54, Sanchayan Maity wrote: > > Code cleanup for improving code readability and error path fixes > > and cleanup removing use of devm_kfree. > > Two things in one, not very nice. Especially the dma_free_coherent is > really a bug and the other is a cleanup. Can you make a separate patch > for the bug? > > As for the cleanup, I don't like the one line conditions too, but I > don't think it is worth a patch. At least the TX path should be solved > with my suggestion in patch 2. Agreed. - Sanchayan. > > -- > Stefan > > > > > 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: