Skip to content

Commit

Permalink
mmc: core: Remove mmc_free_ext_csd()
Browse files Browse the repository at this point in the history
Let callers of mmc_free_ext_csd() do kfree() directly instead.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
storulf committed Nov 10, 2014
1 parent 6130e7a commit 00b41b5
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/mmc/core/mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -640,12 +640,6 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
return err;
}

static inline void mmc_free_ext_csd(u8 *ext_csd)
{
kfree(ext_csd);
}


static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width)
{
u8 *bw_ext_csd;
Expand Down Expand Up @@ -719,7 +713,7 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width)
err = -EINVAL;

out:
mmc_free_ext_csd(bw_ext_csd);
kfree(bw_ext_csd);
return err;
}

Expand Down Expand Up @@ -1570,14 +1564,14 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
if (!oldcard)
host->card = card;

mmc_free_ext_csd(ext_csd);
kfree(ext_csd);
return 0;

free_card:
if (!oldcard)
mmc_remove_card(card);
err:
mmc_free_ext_csd(ext_csd);
kfree(ext_csd);

return err;
}
Expand Down

0 comments on commit 00b41b5

Please sign in to comment.