| Message ID | 1521619643-4492-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | da779513d33575fc43a9ae87a95af6b4354cebaa |
| Headers | show |
On 21.03.2018 09:07, Geert Uytterhoeven wrote: > Use enum dma_transfer_direction as required by dmaengine_prep_slave_sg() > instead of enum dma_data_direction. This won't change behavior in > practice as the enum values are equivalent. > > This fixes two warnings when building with clang: > drivers/spi/spi-sh-msiof.c:755:27: warning: implicit conversion from > enumeration > type 'enum dma_data_direction' to different enumeration type > 'enum dma_transfer_direction' [-Wenum-conversion] > rx->sgl, rx->nents, DMA_FROM_DEVICE, > ^~~~~~~~~~~~~~~ > drivers/spi/spi-sh-msiof.c:772:27: warning: implicit conversion from > enumeration > type 'enum dma_data_direction' to different enumeration type > 'enum dma_transfer_direction' [-Wenum-conversion] > tx->sgl, tx->nents, DMA_TO_DEVICE, > ^~~~~~~~~~~~~ > > Based on commit 768d59f5d0139a6f ("spi: rspi: use correct enum for DMA > transfer direction"). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Looks good to me! Reviewed-by: Stefan Agner <stefan@agner.ch> -- Stefan > --- > drivers/spi/spi-sh-msiof.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c > index c5dcfb434a498b27..ae086aab57d51edc 100644 > --- a/drivers/spi/spi-sh-msiof.c > +++ b/drivers/spi/spi-sh-msiof.c > @@ -752,7 +752,7 @@ static int sh_msiof_dma_once(struct > sh_msiof_spi_priv *p, const void *tx, > if (rx) { > ier_bits |= IER_RDREQE | IER_RDMAE; > desc_rx = dmaengine_prep_slave_single(p->master->dma_rx, > - p->rx_dma_addr, len, DMA_FROM_DEVICE, > + p->rx_dma_addr, len, DMA_DEV_TO_MEM, > DMA_PREP_INTERRUPT | DMA_CTRL_ACK); > if (!desc_rx) > return -EAGAIN; > @@ -769,7 +769,7 @@ static int sh_msiof_dma_once(struct > sh_msiof_spi_priv *p, const void *tx, > dma_sync_single_for_device(p->master->dma_tx->device->dev, > p->tx_dma_addr, len, DMA_TO_DEVICE); > desc_tx = dmaengine_prep_slave_single(p->master->dma_tx, > - p->tx_dma_addr, len, DMA_TO_DEVICE, > + p->tx_dma_addr, len, DMA_MEM_TO_DEV, > DMA_PREP_INTERRUPT | DMA_CTRL_ACK); > if (!desc_tx) { > ret = -EAGAIN; -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index c5dcfb434a498b27..ae086aab57d51edc 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -752,7 +752,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, if (rx) { ier_bits |= IER_RDREQE | IER_RDMAE; desc_rx = dmaengine_prep_slave_single(p->master->dma_rx, - p->rx_dma_addr, len, DMA_FROM_DEVICE, + p->rx_dma_addr, len, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_rx) return -EAGAIN; @@ -769,7 +769,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, dma_sync_single_for_device(p->master->dma_tx->device->dev, p->tx_dma_addr, len, DMA_TO_DEVICE); desc_tx = dmaengine_prep_slave_single(p->master->dma_tx, - p->tx_dma_addr, len, DMA_TO_DEVICE, + p->tx_dma_addr, len, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_tx) { ret = -EAGAIN;
Use enum dma_transfer_direction as required by dmaengine_prep_slave_sg() instead of enum dma_data_direction. This won't change behavior in practice as the enum values are equivalent. This fixes two warnings when building with clang: drivers/spi/spi-sh-msiof.c:755:27: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] rx->sgl, rx->nents, DMA_FROM_DEVICE, ^~~~~~~~~~~~~~~ drivers/spi/spi-sh-msiof.c:772:27: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] tx->sgl, tx->nents, DMA_TO_DEVICE, ^~~~~~~~~~~~~ Based on commit 768d59f5d0139a6f ("spi: rspi: use correct enum for DMA transfer direction"). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/spi/spi-sh-msiof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)