diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-10-16 10:18:51 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-11-10 06:40:39 -0500 |
commit | 00b41b58cdb115ffc28de1adad63a59a61428db8 (patch) | |
tree | cc81ca6f55eebe25b19d2ddfa61c3448289094e5 | |
parent | 6130e7a9c34d01afbd4e7e215846d1f2d70333bb (diff) |
mmc: core: Remove mmc_free_ext_csd()
Let callers of mmc_free_ext_csd() do kfree() directly instead.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r-- | drivers/mmc/core/mmc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index a5e05ceb554c..d4ed62cab23d 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c | |||
@@ -640,12 +640,6 @@ out: | |||
640 | return err; | 640 | return err; |
641 | } | 641 | } |
642 | 642 | ||
643 | static inline void mmc_free_ext_csd(u8 *ext_csd) | ||
644 | { | ||
645 | kfree(ext_csd); | ||
646 | } | ||
647 | |||
648 | |||
649 | static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width) | 643 | static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width) |
650 | { | 644 | { |
651 | u8 *bw_ext_csd; | 645 | u8 *bw_ext_csd; |
@@ -719,7 +713,7 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width) | |||
719 | err = -EINVAL; | 713 | err = -EINVAL; |
720 | 714 | ||
721 | out: | 715 | out: |
722 | mmc_free_ext_csd(bw_ext_csd); | 716 | kfree(bw_ext_csd); |
723 | return err; | 717 | return err; |
724 | } | 718 | } |
725 | 719 | ||
@@ -1570,14 +1564,14 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, | |||
1570 | if (!oldcard) | 1564 | if (!oldcard) |
1571 | host->card = card; | 1565 | host->card = card; |
1572 | 1566 | ||
1573 | mmc_free_ext_csd(ext_csd); | 1567 | kfree(ext_csd); |
1574 | return 0; | 1568 | return 0; |
1575 | 1569 | ||
1576 | free_card: | 1570 | free_card: |
1577 | if (!oldcard) | 1571 | if (!oldcard) |
1578 | mmc_remove_card(card); | 1572 | mmc_remove_card(card); |
1579 | err: | 1573 | err: |
1580 | mmc_free_ext_csd(ext_csd); | 1574 | kfree(ext_csd); |
1581 | 1575 | ||
1582 | return err; | 1576 | return err; |
1583 | } | 1577 | } |