As discussed in 2020 [1], Ulf and I agreed that it would be easier to understand the {h|s}w_reset mechanisms if it was clear that they are for cards. This RFC series implements that by adding 'card' to the function names and changing the parameter to mmc_card where apropriate. Note that I only changed the MMC core. The SDHCI driver still uses hw_reset in its ops, I leave it to the SDHCI maintainers if they want to change that. Also, I didn't convert CAP_HW_RESET to CAP_CARD_HW_RESET yet although it should be done IMHO. However, we need an agreement on that first. Finally, I also did not check if all the host drivers are really doing a card reset or a controller reset. I tried but it was often not obvious what is actually happening in these functions without proper manuals. I tested it with my Renesas boards, so far no regressions. Buildbots are currently checking the series. For this RFC, I sent this as one series so people can get an overview and comment on that. For a proper release, I think patches 1-5 should be one series, and 7-10 probably. Patch 6 could then be applied once patches 2-4 hit the net tree. That's my proposal. This series is based on mmc/next as of yesterday. A branch is here: git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/mmc/reset-api Looking forward to comments. Happy hacking, Wolfram [1] https://lore.kernel.org/all/20200916090121.2350-1-wsa+renesas@xxxxxxxxxxxxxxxxxxxx/ Wolfram Sang (10): mmc: core: improve API to make clear mmc_hw_reset is for cards ath10k: sdio: update to new MMC API for resetting cards brcmfmac: sdio: update to new MMC API for resetting cards mwifiex: sdio: update to new MMC API for resetting cards wlcore: sdio: update to new MMC API for resetting cards mmc: core: remove fallback for mmc_hw_reset() mmc: core: improve API to make clear that mmc_sw_reset is for cards mmc: core: improve API to make clear hw_reset from bus_ops is for cards mmc: core: improve API to make clear sw_reset from bus_ops is for cards mmc: improve API to make clear hw_reset callback is for cards drivers/mmc/core/block.c | 2 +- drivers/mmc/core/core.c | 31 ++++++++++--------- drivers/mmc/core/core.h | 4 +-- drivers/mmc/core/mmc.c | 10 +++--- drivers/mmc/core/mmc_test.c | 3 +- drivers/mmc/core/sd.c | 8 ++--- drivers/mmc/core/sdio.c | 12 ++++--- drivers/mmc/host/bcm2835.c | 2 +- drivers/mmc/host/dw_mmc.c | 2 +- drivers/mmc/host/meson-mx-sdhc-mmc.c | 2 +- drivers/mmc/host/mtk-sd.c | 2 +- drivers/mmc/host/sdhci.c | 2 +- drivers/mmc/host/sunxi-mmc.c | 2 +- drivers/mmc/host/uniphier-sd.c | 2 +- drivers/net/wireless/ath/ath10k/sdio.c | 2 +- .../broadcom/brcm80211/brcmfmac/sdio.c | 2 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- drivers/net/wireless/ti/wlcore/sdio.c | 2 +- include/linux/mmc/core.h | 4 +-- include/linux/mmc/host.h | 2 +- 20 files changed, 51 insertions(+), 47 deletions(-) -- 2.30.2