* [PATCH] mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA
@ 2020-09-14 9:42 Geert Uytterhoeven
2020-09-14 9:48 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2020-09-14 9:42 UTC (permalink / raw)
To: Ulf Hansson
Cc: Rich Felker, Christoph Hellwig, linux-mmc, linux-kernel,
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 <geert@linux-m68k.org>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA
2020-09-14 9:42 [PATCH] mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA Geert Uytterhoeven
@ 2020-09-14 9:48 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2020-09-14 9:48 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Rich Felker, Christoph Hellwig, linux-mmc, Linux Kernel Mailing List
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-14 9:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-14 9:42 [PATCH] mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA Geert Uytterhoeven
2020-09-14 9:48 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®