linux-kernel - Re: [PATCH] mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 14 Sep 2020 11:48:49 +0200
From:   Ulf Hansson <ulf.hansson@...aro.org>
To:     Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Rich Felker <dalias@...c.org>, Christoph Hellwig <hch@....de>,
        "linux-mmc@...r.kernel.org" <linux-mmc@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA

On Mon, 14 Sep 2020 at 11:42, Geert Uytterhoeven <geert@...ux-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@...ux-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
>