| Message ID | 20200120033223.897-1-zhang.chunyan@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] mmc: sdhci: fix an issue of mixing different types | expand |
On 20/01/20 5:32 am, Chunyan Zhang wrote: > Fix an issue reported by sparse, since mixed types of parameters are > used on calling dmaengine_prep_slave_sg(). > > Fixes: 36e1da441fec (mmc: sdhci: add support for using external DMA devices) That commit number is only in next > Reported-by: kbuild test robot <lkp@intel.com> > Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org> > Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > Changes from v1: > * address comments from Nathan Chancellor > - define a new variable to avoid type conversions. > --- > drivers/mmc/host/sdhci.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 30b5a624b50e..f9e0b5f2c692 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -1201,6 +1201,7 @@ static int sdhci_external_dma_setup(struct sdhci_host *host, > struct mmc_command *cmd) > { > int ret, i; > + enum dma_transfer_direction dir; > struct dma_async_tx_descriptor *desc; > struct mmc_data *data = cmd->data; > struct dma_chan *chan; > @@ -1234,8 +1235,8 @@ static int sdhci_external_dma_setup(struct sdhci_host *host, > if (sg_cnt <= 0) > return -EINVAL; > > - desc = dmaengine_prep_slave_sg(chan, data->sg, data->sg_len, > - mmc_get_dma_dir(data), > + dir = data->flags & MMC_DATA_WRITE ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; > + desc = dmaengine_prep_slave_sg(chan, data->sg, data->sg_len, dir, > DMA_PREP_INTERRUPT | DMA_CTRL_ACK); > if (!desc) > return -EINVAL; >
On Mon, 20 Jan 2020 at 15:15, Adrian Hunter <adrian.hunter@intel.com> wrote: > > On 20/01/20 5:32 am, Chunyan Zhang wrote: > > Fix an issue reported by sparse, since mixed types of parameters are > > used on calling dmaengine_prep_slave_sg(). > > > > Fixes: 36e1da441fec (mmc: sdhci: add support for using external DMA devices) > > That commit number is only in next Ok, so should this line be removed? > > > Reported-by: kbuild test robot <lkp@intel.com> > > Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org> > > Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> > > Acked-by: Adrian Hunter <adrian.hunter@intel.com> Thank you! Chunyan > > > --- > > Changes from v1: > > * address comments from Nathan Chancellor > > - define a new variable to avoid type conversions. > > --- > > drivers/mmc/host/sdhci.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > > index 30b5a624b50e..f9e0b5f2c692 100644 > > --- a/drivers/mmc/host/sdhci.c > > +++ b/drivers/mmc/host/sdhci.c > > @@ -1201,6 +1201,7 @@ static int sdhci_external_dma_setup(struct sdhci_host *host, > > struct mmc_command *cmd) > > { > > int ret, i; > > + enum dma_transfer_direction dir; > > struct dma_async_tx_descriptor *desc; > > struct mmc_data *data = cmd->data; > > struct dma_chan *chan; > > @@ -1234,8 +1235,8 @@ static int sdhci_external_dma_setup(struct sdhci_host *host, > > if (sg_cnt <= 0) > > return -EINVAL; > > > > - desc = dmaengine_prep_slave_sg(chan, data->sg, data->sg_len, > > - mmc_get_dma_dir(data), > > + dir = data->flags & MMC_DATA_WRITE ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; > > + desc = dmaengine_prep_slave_sg(chan, data->sg, data->sg_len, dir, > > DMA_PREP_INTERRUPT | DMA_CTRL_ACK); > > if (!desc) > > return -EINVAL; > > >
On Mon, 20 Jan 2020 at 09:14, Chunyan Zhang <zhang.lyra@gmail.com> wrote: > > On Mon, 20 Jan 2020 at 15:15, Adrian Hunter <adrian.hunter@intel.com> wrote: > > > > On 20/01/20 5:32 am, Chunyan Zhang wrote: > > > Fix an issue reported by sparse, since mixed types of parameters are > > > used on calling dmaengine_prep_slave_sg(). > > > > > > Fixes: 36e1da441fec (mmc: sdhci: add support for using external DMA devices) > > > > That commit number is only in next > > Ok, so should this line be removed? Normally yes, because I may rebase my next branch. However, at this point in time I am not planning for a rebase, so let's keep it. > > > > > > Reported-by: kbuild test robot <lkp@intel.com> > > > Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org> > > > Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> > > > > Acked-by: Adrian Hunter <adrian.hunter@intel.com> > > Thank you! > > Chunyan [...] Applied for next, thanks! Kind regards Uffe
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 30b5a624b50e..f9e0b5f2c692 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1201,6 +1201,7 @@ static int sdhci_external_dma_setup(struct sdhci_host *host, struct mmc_command *cmd) { int ret, i; + enum dma_transfer_direction dir; struct dma_async_tx_descriptor *desc; struct mmc_data *data = cmd->data; struct dma_chan *chan; @@ -1234,8 +1235,8 @@ static int sdhci_external_dma_setup(struct sdhci_host *host, if (sg_cnt <= 0) return -EINVAL; - desc = dmaengine_prep_slave_sg(chan, data->sg, data->sg_len, - mmc_get_dma_dir(data), + dir = data->flags & MMC_DATA_WRITE ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; + desc = dmaengine_prep_slave_sg(chan, data->sg, data->sg_len, dir, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc) return -EINVAL;