| Message ID | 1355301960-21523-1-git-send-email-balbi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 12 Dec 2012 10:45:59 +0200, Felipe Balbi <balbi@ti.com> wrote: > No actual errors have been found for completing > before disabling DMA request lines, but it just > looks more semantically correct that on our DMA > callback we quiesce the whole thing before stating > transfer is finished. > > Signed-off-by: Felipe Balbi <balbi@ti.com> Applied, thanks. g. > --- > drivers/spi/spi-omap2-mcspi.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c > index b610f52..68446db 100644 > --- a/drivers/spi/spi-omap2-mcspi.c > +++ b/drivers/spi/spi-omap2-mcspi.c > @@ -298,10 +298,10 @@ static void omap2_mcspi_rx_callback(void *data) > struct omap2_mcspi *mcspi = spi_master_get_devdata(spi->master); > struct omap2_mcspi_dma *mcspi_dma = &mcspi->dma_channels[spi->chip_select]; > > - complete(&mcspi_dma->dma_rx_completion); > - > /* We must disable the DMA RX request */ > omap2_mcspi_set_dma_req(spi, 1, 0); > + > + complete(&mcspi_dma->dma_rx_completion); > } > > static void omap2_mcspi_tx_callback(void *data) > @@ -310,10 +310,10 @@ static void omap2_mcspi_tx_callback(void *data) > struct omap2_mcspi *mcspi = spi_master_get_devdata(spi->master); > struct omap2_mcspi_dma *mcspi_dma = &mcspi->dma_channels[spi->chip_select]; > > - complete(&mcspi_dma->dma_tx_completion); > - > /* We must disable the DMA TX request */ > omap2_mcspi_set_dma_req(spi, 0, 0); > + > + complete(&mcspi_dma->dma_tx_completion); > } > > static void omap2_mcspi_tx_dma(struct spi_device *spi, > -- > 1.8.1.rc1.5.g7e0651a >
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index b610f52..68446db 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -298,10 +298,10 @@ static void omap2_mcspi_rx_callback(void *data) struct omap2_mcspi *mcspi = spi_master_get_devdata(spi->master); struct omap2_mcspi_dma *mcspi_dma = &mcspi->dma_channels[spi->chip_select]; - complete(&mcspi_dma->dma_rx_completion); - /* We must disable the DMA RX request */ omap2_mcspi_set_dma_req(spi, 1, 0); + + complete(&mcspi_dma->dma_rx_completion); } static void omap2_mcspi_tx_callback(void *data) @@ -310,10 +310,10 @@ static void omap2_mcspi_tx_callback(void *data) struct omap2_mcspi *mcspi = spi_master_get_devdata(spi->master); struct omap2_mcspi_dma *mcspi_dma = &mcspi->dma_channels[spi->chip_select]; - complete(&mcspi_dma->dma_tx_completion); - /* We must disable the DMA TX request */ omap2_mcspi_set_dma_req(spi, 0, 0); + + complete(&mcspi_dma->dma_tx_completion); } static void omap2_mcspi_tx_dma(struct spi_device *spi,
No actual errors have been found for completing before disabling DMA request lines, but it just looks more semantically correct that on our DMA callback we quiesce the whole thing before stating transfer is finished. Signed-off-by: Felipe Balbi <balbi@ti.com> --- drivers/spi/spi-omap2-mcspi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)