Commit f7f37154 authored by Oliver Neukum's avatar Oliver Neukum Committed by Ulf Hansson
Browse files

mmc: core: remove uselss memalloc_noio_save 



mmc_sd_num_wr_blocks() is in the block error path.
It needs to use GFP_NOIO. There is no need to complicate
anything here.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 211ddde0

drivers/mmc/core/block.c

+1 −4
Original line number Diff line number Diff line
@@ -957,7 +957,6 @@ static int mmc_sd_num_wr_blocks(struct mmc_card *card, u32 *written_blocks) 
	u32 result;

	__be32 *blocks;

	u8 resp_sz = mmc_card_ult_capacity(card) ? 8 : 4;

	unsigned int noio_flag;



	struct mmc_request mrq = {};

	struct mmc_command cmd = {};
@@ -982,9 +981,7 @@ static int mmc_sd_num_wr_blocks(struct mmc_card *card, u32 *written_blocks) 
	mrq.cmd = &cmd;

	mrq.data = &data;



	noio_flag = memalloc_noio_save();

	blocks = kmalloc(resp_sz, GFP_KERNEL);

	memalloc_noio_restore(noio_flag);

	blocks = kmalloc(resp_sz, GFP_NOIO);

	if (!blocks)

		return -ENOMEM;