summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2017-06-08 15:27:44 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2017-06-20 10:30:46 +0200
commitc92e68d8a6595fec3e1f778edb4760507aef18d2 (patch)
tree0b67450bf68448df8bc4a9a36555a9272e00e79a /drivers/mmc
parentmmc: core: Re-factor code for sending CID (diff)
downloadlinux-c92e68d8a6595fec3e1f778edb4760507aef18d2.tar.xz
linux-c92e68d8a6595fec3e1f778edb4760507aef18d2.zip
mmc: core: Drop mmc_all_send_cid() and use mmc_send_cxd_native() instead
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/core/mmc_ops.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index b92bfe85c671..46c80f829936 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -207,24 +207,6 @@ int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
return err;
}
-static int mmc_all_send_cid(struct mmc_host *host, u32 *cid)
-{
- int err;
- struct mmc_command cmd = {};
-
- cmd.opcode = MMC_ALL_SEND_CID;
- cmd.arg = 0;
- cmd.flags = MMC_RSP_R2 | MMC_CMD_BCR;
-
- err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
- if (err)
- return err;
-
- memcpy(cid, cmd.resp, sizeof(u32) * 4);
-
- return 0;
-}
-
int mmc_set_relative_addr(struct mmc_card *card)
{
struct mmc_command cmd = {};
@@ -360,7 +342,7 @@ int mmc_send_cid(struct mmc_host *host, u32 *cid)
if (mmc_host_is_spi(host))
return mmc_spi_send_cid(host, cid);
- return mmc_all_send_cid(host, cid);
+ return mmc_send_cxd_native(host, 0, cid, MMC_ALL_SEND_CID);
}
int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)