Commit a68dd9a0 authored by Chunyan Zhang's avatar Chunyan Zhang Committed by Ulf Hansson
Browse files

mmc: sdhci: Convert sdhci_allocate_bounce_buffer() to return void 



The function sdhci_allocate_bounce_buffer() always return zero at
present, so there's no need to have a return value, that will also make
error path easier.

CC: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarChunyan Zhang <zhang.chunyan@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent bb16956e

drivers/mmc/host/sdhci.c

+5 −10
Original line number Diff line number Diff line
@@ -3541,7 +3541,7 @@ void __sdhci_read_caps(struct sdhci_host *host, u16 *ver, u32 *caps, u32 *caps1) 
}

EXPORT_SYMBOL_GPL(__sdhci_read_caps);



static int sdhci_allocate_bounce_buffer(struct sdhci_host *host)

static void sdhci_allocate_bounce_buffer(struct sdhci_host *host)

{

	struct mmc_host *mmc = host->mmc;

	unsigned int max_blocks;
@@ -3579,7 +3579,7 @@ static int sdhci_allocate_bounce_buffer(struct sdhci_host *host) 
		 * Exiting with zero here makes sure we proceed with

		 * mmc->max_segs == 1.

		 */

		return 0;

		return;

	}



	host->bounce_addr = dma_map_single(mmc->parent,
@@ -3589,7 +3589,7 @@ static int sdhci_allocate_bounce_buffer(struct sdhci_host *host) 
	ret = dma_mapping_error(mmc->parent, host->bounce_addr);

	if (ret)

		/* Again fall back to max_segs == 1 */

		return 0;

		return;

	host->bounce_buffer_size = bounce_size;



	/* Lie about this since we're bouncing */
@@ -3599,8 +3599,6 @@ static int sdhci_allocate_bounce_buffer(struct sdhci_host *host) 


	pr_info("%s bounce up to %u segments into one, max segment size %u bytes\n",

		mmc_hostname(mmc), max_blocks, bounce_size);



	return 0;

}



static inline bool sdhci_can_64bit_dma(struct sdhci_host *host)
@@ -4134,12 +4132,9 @@ int sdhci_setup_host(struct sdhci_host *host) 
	 */

	mmc->max_blk_count = (host->quirks & SDHCI_QUIRK_NO_MULTIBLOCK) ? 1 : 65535;



	if (mmc->max_segs == 1) {

	if (mmc->max_segs == 1)

		/* This may alter mmc->*_blk_* parameters */

		ret = sdhci_allocate_bounce_buffer(host);

		if (ret)

			return ret;

	}

		sdhci_allocate_bounce_buffer(host);



	return 0;