| Message ID | 20210201055507.542-1-zbestahu@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: core: Use host instead of card argument to mmc_spi_send_csd() | expand |
On Mon, 1 Feb 2021 at 06:57, Yue Hu <zbestahu@gmail.com> wrote: > > From: Yue Hu <huyue2@yulong.com> > > Since mmc_send_cxd_data() does not care card if opcode is MMC_SEND_CSD. > > Signed-off-by: Yue Hu <huyue2@yulong.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/core/mmc_ops.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c > index baa6314..265d95e 100644 > --- a/drivers/mmc/core/mmc_ops.c > +++ b/drivers/mmc/core/mmc_ops.c > @@ -296,7 +296,7 @@ int mmc_set_relative_addr(struct mmc_card *card) > return 0; > } > > -static int mmc_spi_send_csd(struct mmc_card *card, u32 *csd) > +static int mmc_spi_send_csd(struct mmc_host *host, u32 *csd) > { > int ret, i; > __be32 *csd_tmp; > @@ -305,7 +305,7 @@ static int mmc_spi_send_csd(struct mmc_card *card, u32 *csd) > if (!csd_tmp) > return -ENOMEM; > > - ret = mmc_send_cxd_data(card, card->host, MMC_SEND_CSD, csd_tmp, 16); > + ret = mmc_send_cxd_data(NULL, host, MMC_SEND_CSD, csd_tmp, 16); > if (ret) > goto err; > > @@ -320,7 +320,7 @@ static int mmc_spi_send_csd(struct mmc_card *card, u32 *csd) > int mmc_send_csd(struct mmc_card *card, u32 *csd) > { > if (mmc_host_is_spi(card->host)) > - return mmc_spi_send_csd(card, csd); > + return mmc_spi_send_csd(card->host, csd); > > return mmc_send_cxd_native(card->host, card->rca << 16, csd, > MMC_SEND_CSD); > -- > 1.9.1 >
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index baa6314..265d95e 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -296,7 +296,7 @@ int mmc_set_relative_addr(struct mmc_card *card) return 0; } -static int mmc_spi_send_csd(struct mmc_card *card, u32 *csd) +static int mmc_spi_send_csd(struct mmc_host *host, u32 *csd) { int ret, i; __be32 *csd_tmp; @@ -305,7 +305,7 @@ static int mmc_spi_send_csd(struct mmc_card *card, u32 *csd) if (!csd_tmp) return -ENOMEM; - ret = mmc_send_cxd_data(card, card->host, MMC_SEND_CSD, csd_tmp, 16); + ret = mmc_send_cxd_data(NULL, host, MMC_SEND_CSD, csd_tmp, 16); if (ret) goto err; @@ -320,7 +320,7 @@ static int mmc_spi_send_csd(struct mmc_card *card, u32 *csd) int mmc_send_csd(struct mmc_card *card, u32 *csd) { if (mmc_host_is_spi(card->host)) - return mmc_spi_send_csd(card, csd); + return mmc_spi_send_csd(card->host, csd); return mmc_send_cxd_native(card->host, card->rca << 16, csd, MMC_SEND_CSD);