mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA
Subsystems (2)
PATCH 1/1 mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA
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 <[email protected]>
--- drivers/mmc/host/mmc_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/mmc_spi.c +1 -1
@@ -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
Signature · 1 line
2.17.1
Quoted 11 lines · Geert Uytterhoeven
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 <[email protected]>
Geert, my mistake, thanks for helping out and fixing it!
Applied for fixes, thanks!
Kind regards
Uffe
Quoted 20 lines
--- drivers/mmc/host/mmc_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/mmc/host/mmc_spi.c +1
-2@@ -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