| Message ID | 20210118084520.241-1-zbestahu@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] mmc: core: remove unused host parameter of mmc_sd_get_csd() | expand |
On Mon, 18 Jan 2021 at 09:45, Yue Hu <zbestahu@gmail.com> wrote: > > From: Yue Hu <huyue2@yulong.com> > > The host parameter is not used in the body of mmc_sd_get_csd(), > so let's remove it. Update related code at the same time. > > Signed-off-by: Yue Hu <huyue2@yulong.com> Applied for next, thanks! Kind regards Uffe > --- > v2: fix minor commit message. > > drivers/mmc/core/sd.c | 4 ++-- > drivers/mmc/core/sd.h | 2 +- > drivers/mmc/core/sdio.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c > index 6f054c4..6fa51a6 100644 > --- a/drivers/mmc/core/sd.c > +++ b/drivers/mmc/core/sd.c > @@ -860,7 +860,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) > return err; > } > > -int mmc_sd_get_csd(struct mmc_host *host, struct mmc_card *card) > +int mmc_sd_get_csd(struct mmc_card *card) > { > int err; > > @@ -1046,7 +1046,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, > } > > if (!oldcard) { > - err = mmc_sd_get_csd(host, card); > + err = mmc_sd_get_csd(card); > if (err) > goto free_card; > > diff --git a/drivers/mmc/core/sd.h b/drivers/mmc/core/sd.h > index 497c026..1af5a03 100644 > --- a/drivers/mmc/core/sd.h > +++ b/drivers/mmc/core/sd.h > @@ -10,7 +10,7 @@ > struct mmc_card; > > int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr); > -int mmc_sd_get_csd(struct mmc_host *host, struct mmc_card *card); > +int mmc_sd_get_csd(struct mmc_card *card); > void mmc_decode_cid(struct mmc_card *card); > int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card, > bool reinit); > diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c > index 694a212..0fda778 100644 > --- a/drivers/mmc/core/sdio.c > +++ b/drivers/mmc/core/sdio.c > @@ -751,7 +751,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, > * Read CSD, before selecting the card > */ > if (!oldcard && card->type == MMC_TYPE_SD_COMBO) { > - err = mmc_sd_get_csd(host, card); > + err = mmc_sd_get_csd(card); > if (err) > goto remove; > > -- > 1.9.1 >
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 6f054c4..6fa51a6 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -860,7 +860,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) return err; } -int mmc_sd_get_csd(struct mmc_host *host, struct mmc_card *card) +int mmc_sd_get_csd(struct mmc_card *card) { int err; @@ -1046,7 +1046,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, } if (!oldcard) { - err = mmc_sd_get_csd(host, card); + err = mmc_sd_get_csd(card); if (err) goto free_card; diff --git a/drivers/mmc/core/sd.h b/drivers/mmc/core/sd.h index 497c026..1af5a03 100644 --- a/drivers/mmc/core/sd.h +++ b/drivers/mmc/core/sd.h @@ -10,7 +10,7 @@ struct mmc_card; int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr); -int mmc_sd_get_csd(struct mmc_host *host, struct mmc_card *card); +int mmc_sd_get_csd(struct mmc_card *card); void mmc_decode_cid(struct mmc_card *card); int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card, bool reinit); diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 694a212..0fda778 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -751,7 +751,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, * Read CSD, before selecting the card */ if (!oldcard && card->type == MMC_TYPE_SD_COMBO) { - err = mmc_sd_get_csd(host, card); + err = mmc_sd_get_csd(card); if (err) goto remove;