| Message ID | 20200914094243.3912-1-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA | expand |
On Mon, 14 Sep 2020 at 11:42, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > If CONFIG_NO_DMA=y (e.g. Sun-3 allmodconfig): > > drivers/mmc/host/mmc_spi.c:1323:15: warning: return type defaults to ‘int’ [-Wreturn-type] > static inline mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; } > ^~~~~~~~~~~~~~~~~ > > Fix this by adding the missing return type. > > Fixes: a395acf0f6dc6409 ("mmc: mmc_spi: Allow the driver to be built when CONFIG_HAS_DMA is unset") > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Geert, my mistake, thanks for helping out and fixing it! Applied for fixes, thanks! Kind regards Uffe > --- > drivers/mmc/host/mmc_spi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c > index 5055a7eb134ac13f..18a850f37ddce27e 100644 > --- a/drivers/mmc/host/mmc_spi.c > +++ b/drivers/mmc/host/mmc_spi.c > @@ -1320,7 +1320,7 @@ static void mmc_spi_dma_free(struct mmc_spi_host *host) > DMA_BIDIRECTIONAL); > } > #else > -static inline mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; } > +static inline int mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; } > static inline void mmc_spi_dma_free(struct mmc_spi_host *host) {} > #endif > > -- > 2.17.1 >
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 5055a7eb134ac13f..18a850f37ddce27e 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -1320,7 +1320,7 @@ static void mmc_spi_dma_free(struct mmc_spi_host *host) DMA_BIDIRECTIONAL); } #else -static inline mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; } +static inline int mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; } static inline void mmc_spi_dma_free(struct mmc_spi_host *host) {} #endif
If CONFIG_NO_DMA=y (e.g. Sun-3 allmodconfig): drivers/mmc/host/mmc_spi.c:1323:15: warning: return type defaults to ‘int’ [-Wreturn-type] static inline mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; } ^~~~~~~~~~~~~~~~~ Fix this by adding the missing return type. Fixes: a395acf0f6dc6409 ("mmc: mmc_spi: Allow the driver to be built when CONFIG_HAS_DMA is unset") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/mmc/host/mmc_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)