From: Geert Uytterhoeven Date: Mon, 14 Sep 2020 09:42:43 +0000 (+0200) Subject: mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA X-Git-Tag: baikal/aarch64/sdk6.1~8349^2 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=81e62ac0088d13c8ca53927ce8a99a8aead5e108;p=kernel.git 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: 023aa8626c05b2d3 ("mmc: mmc_spi: Allow the driver to be built when CONFIG_HAS_DMA is unset") Signed-off-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/20200914094243.3912-1-geert@linux-m68k.org Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 5055a7eb134ac..18a850f37ddce 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