[U-Boot] [PATCH 04/23] dm: mmc: Move mmc_switch_part() above its callers
Simon Glass
sjg at chromium.org
Mon Apr 11 03:12:24 CEST 2016
This function is defined after it is used. In preparation for making it
static, move it up a little. Also drop the printf() which should not appear
in a driver.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
drivers/mmc/mmc.c | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 185d7b2..2211ac6 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -582,30 +582,6 @@ static int mmc_set_capacity(struct mmc *mmc, int part_num)
return 0;
}
-int mmc_select_hwpart(int dev_num, int hwpart)
-{
- struct mmc *mmc = find_mmc_device(dev_num);
- int ret;
-
- if (!mmc)
- return -ENODEV;
-
- if (mmc->block_dev.hwpart == hwpart)
- return 0;
-
- if (mmc->part_config == MMCPART_NOAVAILABLE) {
- printf("Card doesn't support part_switch\n");
- return -EMEDIUMTYPE;
- }
-
- ret = mmc_switch_part(dev_num, hwpart);
- if (ret)
- return ret;
-
- return 0;
-}
-
-
int mmc_switch_part(int dev_num, unsigned int part_num)
{
struct mmc *mmc = find_mmc_device(dev_num);
@@ -630,6 +606,27 @@ int mmc_switch_part(int dev_num, unsigned int part_num)
return ret;
}
+int mmc_select_hwpart(int dev_num, int hwpart)
+{
+ struct mmc *mmc = find_mmc_device(dev_num);
+ int ret;
+
+ if (!mmc)
+ return -ENODEV;
+
+ if (mmc->block_dev.hwpart == hwpart)
+ return 0;
+
+ if (mmc->part_config == MMCPART_NOAVAILABLE)
+ return -EMEDIUMTYPE;
+
+ ret = mmc_switch_part(dev_num, hwpart);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
int mmc_hwpart_config(struct mmc *mmc,
const struct mmc_hwpart_conf *conf,
enum mmc_hwpart_conf_mode mode)
--
2.8.0.rc3.226.g39d4020
More information about the U-Boot
mailing list