From: maitysanchayan@gmail.com
To: Stefan Agner <stefan@agner.ch>
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
Date: Tue, 22 Nov 2016 11:42:23 +0530 [thread overview]
Message-ID: <20161122061222.GB2484@Sanchayan-Arch.localdomain> (raw)
In-Reply-To: <43b518a92352986f09b0893646ff8016@agner.ch>
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 <maitysanchayan@gmail.com>
> > ---
> > 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:
prev parent reply other threads:[~2016-11-22 6:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-21 5:54 [PATCH v2 0/4] Fixes for Vybrid SPI DMA implementation Sanchayan Maity
[not found] ` <cover.1479706671.git.maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-21 5:54 ` [PATCH v2 1/4] spi: spi-fsl-dspi: Fix SPI transfer issue when using multiple SPI_IOC_MESSAGE Sanchayan Maity
[not found] ` <bbdbc8df434dd2af74eb351b799a2812a1c1967e.1479706671.git.maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-21 19:18 ` Mark Brown
[not found] ` <20161121191847.vg32cwople4qmini-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-11-21 19:14 ` maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w
2016-11-21 19:18 ` maitysanchayan
[not found] ` <20161121191850.GB24521-2b/appYahYDPUjlVagVGR1Kr0EmMEXJSn9A1Ff6Mc9Q@public.gmane.org>
2016-11-22 16:22 ` Mark Brown
2016-11-21 5:54 ` [PATCH v2 2/4] spi: spi-fsl-dspi: Fix continuous selection format Sanchayan Maity
2016-11-21 23:15 ` Stefan Agner
[not found] ` <59ac10adfe92916770aa30146e958887-XLVq0VzYD2Y@public.gmane.org>
2016-11-22 6:11 ` maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w
2016-11-21 5:54 ` [PATCH v2 3/4] spi: spi-fsl-dspi: Fix incorrect DMA setup Sanchayan Maity
[not found] ` <a36bac5f2499d1002693a7dbf95982bab186e51f.1479706671.git.maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-21 23:16 ` Stefan Agner
2016-11-22 17:26 ` Applied "spi: spi-fsl-dspi: Fix incorrect DMA setup" to the spi tree Mark Brown
2016-11-21 5:54 ` [PATCH v2 4/4] spi: spi-fsl-dspi: Minor code cleanup and error path fixes Sanchayan Maity
[not found] ` <971874d8e662622c0cfe478adaa4c75b08388d0e.1479706671.git.maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-21 23:22 ` Stefan Agner
2016-11-22 6:12 ` maitysanchayan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161122061222.GB2484@Sanchayan-Arch.localdomain \
--to=maitysanchayan@gmail.com \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=stefan@agner.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).