| Message ID | 1499330625-108840-1-git-send-email-shawn.lin@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jul 06, 2017 at 04:43:45PM +0800, Shawn Lin wrote: > We got a warning: > > drivers/mmc/host/atmel-mci.c:1086:15: warning: variable 'sg_len' set but > not used [-Wunused-but-set-variable] > > Ideally we should check to see if sg_len is zero but looking > into the code closely, I didn't find any possible to do that as > atmci_start_request didn't even deploy any error handling for > its host->prepare_data hook. So even we return error value for iflags > like what other host drivers did, for instance, sdhci and dwmmc, it still > need some extra work to improve the code. > > Just remove it to silent the warning, although it isn't perfect. > > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com> Thanks > --- > > drivers/mmc/host/atmel-mci.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index 97de2d3..53e30b0 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -1083,7 +1083,6 @@ static u32 atmci_prepare_data(struct atmel_mci *host, struct mmc_data *data) > atmci_prepare_data_pdc(struct atmel_mci *host, struct mmc_data *data) > { > u32 iflags, tmp; > - unsigned int sg_len; > int i; > > data->error = -EINPROGRESS; > @@ -1108,8 +1107,8 @@ static u32 atmci_prepare_data(struct atmel_mci *host, struct mmc_data *data) > > /* Configure PDC */ > host->data_size = data->blocks * data->blksz; > - sg_len = dma_map_sg(&host->pdev->dev, data->sg, data->sg_len, > - mmc_get_dma_dir(data)); > + dma_map_sg(&host->pdev->dev, data->sg, data->sg_len, > + mmc_get_dma_dir(data)); > > if ((!host->caps.has_rwproof) > && (host->data->flags & MMC_DATA_WRITE)) { > -- > 1.9.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 6 July 2017 at 10:43, Shawn Lin <shawn.lin@rock-chips.com> wrote: > We got a warning: > > drivers/mmc/host/atmel-mci.c:1086:15: warning: variable 'sg_len' set but > not used [-Wunused-but-set-variable] > > Ideally we should check to see if sg_len is zero but looking > into the code closely, I didn't find any possible to do that as > atmci_start_request didn't even deploy any error handling for > its host->prepare_data hook. So even we return error value for iflags > like what other host drivers did, for instance, sdhci and dwmmc, it still > need some extra work to improve the code. > > Just remove it to silent the warning, although it isn't perfect. > > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Thanks, applied for next! Kind regards Uffe > --- > > drivers/mmc/host/atmel-mci.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index 97de2d3..53e30b0 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -1083,7 +1083,6 @@ static u32 atmci_prepare_data(struct atmel_mci *host, struct mmc_data *data) > atmci_prepare_data_pdc(struct atmel_mci *host, struct mmc_data *data) > { > u32 iflags, tmp; > - unsigned int sg_len; > int i; > > data->error = -EINPROGRESS; > @@ -1108,8 +1107,8 @@ static u32 atmci_prepare_data(struct atmel_mci *host, struct mmc_data *data) > > /* Configure PDC */ > host->data_size = data->blocks * data->blksz; > - sg_len = dma_map_sg(&host->pdev->dev, data->sg, data->sg_len, > - mmc_get_dma_dir(data)); > + dma_map_sg(&host->pdev->dev, data->sg, data->sg_len, > + mmc_get_dma_dir(data)); > > if ((!host->caps.has_rwproof) > && (host->data->flags & MMC_DATA_WRITE)) { > -- > 1.9.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" 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/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 97de2d3..53e30b0 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1083,7 +1083,6 @@ static u32 atmci_prepare_data(struct atmel_mci *host, struct mmc_data *data) atmci_prepare_data_pdc(struct atmel_mci *host, struct mmc_data *data) { u32 iflags, tmp; - unsigned int sg_len; int i; data->error = -EINPROGRESS; @@ -1108,8 +1107,8 @@ static u32 atmci_prepare_data(struct atmel_mci *host, struct mmc_data *data) /* Configure PDC */ host->data_size = data->blocks * data->blksz; - sg_len = dma_map_sg(&host->pdev->dev, data->sg, data->sg_len, - mmc_get_dma_dir(data)); + dma_map_sg(&host->pdev->dev, data->sg, data->sg_len, + mmc_get_dma_dir(data)); if ((!host->caps.has_rwproof) && (host->data->flags & MMC_DATA_WRITE)) {
We got a warning: drivers/mmc/host/atmel-mci.c:1086:15: warning: variable 'sg_len' set but not used [-Wunused-but-set-variable] Ideally we should check to see if sg_len is zero but looking into the code closely, I didn't find any possible to do that as atmci_start_request didn't even deploy any error handling for its host->prepare_data hook. So even we return error value for iflags like what other host drivers did, for instance, sdhci and dwmmc, it still need some extra work to improve the code. Just remove it to silent the warning, although it isn't perfect. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> --- drivers/mmc/host/atmel-mci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)