redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mmc: block: return errorcode from mmc_sd_num_wr_blocks() 

mmc_sd_num_wr_blocks() has an interesting construction that
saves one return argument by casting (u32)-1 as error code
if something goes wrong.

This is however a bit confusing when the normal kernel
pattern is to return an int error code on success.

So instead pass a variable "blocks" that the function can
fill in with the number of successfully transferred blocks
and return an integer as error code.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
[Ulf: Changed a return code to -EIO, reported by Dan Carpenter and fixed
by Linus Walleij]
hifive-unleashed-5.1
Linus Walleij 2017-02-01 13:47:57 +01:00 committed by Ulf Hansson
parent 9491be5ff0
commit 169f03a064
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/mmc/core/block.c
View File

@ -763,7 +763,7 @@ static inline int mmc_blk_part_switch(struct mmc_card *card,
return 0;
}
static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
static int mmc_sd_num_wr_blocks(struct mmc_card *card, u32 *written_blocks)
{
int err;
u32 result;
@ -781,9 +781,9 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err)
return (u32)-1;
return err;
if (!mmc_host_is_spi(card->host) && !(cmd.resp[0] & R1_APP_CMD))
return (u32)-1;
return -EIO;
memset(&cmd, 0, sizeof(struct mmc_command));
@ -803,7 +803,7 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
blocks = kmalloc(4, GFP_KERNEL);
if (!blocks)
return (u32)-1;
return -ENOMEM;
sg_init_one(&sg, blocks, 4);
@ -813,9 +813,11 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
kfree(blocks);
if (cmd.error || data.error)
result = (u32)-1;
return -EIO;
return result;
*written_blocks = result;
return 0;
}
static int get_card_status(struct mmc_card *card, u32 *status, int retries)
@ -1576,9 +1578,10 @@ static int mmc_blk_cmd_err(struct mmc_blk_data *md, struct mmc_card *card,
*/
if (mmc_card_sd(card)) {
u32 blocks;
int err;
blocks = mmc_sd_num_wr_blocks(card);
if (blocks != (u32)-1) {
err = mmc_sd_num_wr_blocks(card, &blocks);
if (!err) {
ret = blk_end_request(req, 0, blocks << 9);
}
} else {