| Message ID | 20230811101404.4463-1-victorshihgli@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V1] mmc: core: Cleanup mmc_sd_num_wr_blocks function | expand |
On Fri, 11 Aug 2023 at 12:14, Victor Shih <victorshihgli@gmail.com> wrote: > > From: Victor Shih <victor.shih@genesyslogic.com.tw> > > Use mmc_app_cmd function to simplify code in > mmc_sd_num_wr_blocks function. > > Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw> Applied for next (by amending a minor part, see below), thanks! Kind regards Uffe > --- > drivers/mmc/core/block.c | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index f701efb1fa78..c665b25bffc3 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -918,17 +918,9 @@ static int mmc_sd_num_wr_blocks(struct mmc_card *card, u32 *written_blocks) > > struct scatterlist sg; > > - cmd.opcode = MMC_APP_CMD; > - cmd.arg = card->rca << 16; > - cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; > - > - err = mmc_wait_for_cmd(card->host, &cmd, 0); > - if (err) > - return err; > - if (!mmc_host_is_spi(card->host) && !(cmd.resp[0] & R1_APP_CMD)) > - return -EIO; > - > - memset(&cmd, 0, sizeof(struct mmc_command)); > + err = mmc_app_cmd(card->host, card); > + if (err) This is one more indentation than required. As I said above, I have fixed it up before applying, no action from you needed this time. > + return err; > > cmd.opcode = SD_APP_SEND_NUM_WR_BLKS; > cmd.arg = 0; > -- > 2.25.1 >
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index f701efb1fa78..c665b25bffc3 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -918,17 +918,9 @@ static int mmc_sd_num_wr_blocks(struct mmc_card *card, u32 *written_blocks) struct scatterlist sg; - cmd.opcode = MMC_APP_CMD; - cmd.arg = card->rca << 16; - cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; - - err = mmc_wait_for_cmd(card->host, &cmd, 0); - if (err) - return err; - if (!mmc_host_is_spi(card->host) && !(cmd.resp[0] & R1_APP_CMD)) - return -EIO; - - memset(&cmd, 0, sizeof(struct mmc_command)); + err = mmc_app_cmd(card->host, card); + if (err) + return err; cmd.opcode = SD_APP_SEND_NUM_WR_BLKS; cmd.arg = 0;