]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: dw_mmc: Remove mshc alias support
authorShawn Lin <shawn.lin@rock-chips.com>
Fri, 23 Jan 2026 12:24:09 +0000 (20:24 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 23 Feb 2026 11:06:55 +0000 (12:06 +0100)
Remove the long-deprecated mshc alias support, as the mmc core already
provides alias functionality through the standard mmc alias. This eliminates
the redundant dual-alias system. The driver now obtains the controller ID
from struct mmc_host::index(supplied by mmc alias) instead of the legacy mshc
alias.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/dw_mmc.c

index d7c5b13e48f90827641a599b909e464e5bc772fa..d9a0ea41ef585251e326734cf78354e647c98758 100644 (file)
@@ -2817,13 +2817,10 @@ static int dw_mci_init_host_caps(struct dw_mci *host)
        if (drv_data)
                mmc->caps |= drv_data->common_caps;
 
-       if (host->dev->of_node) {
-               ctrl_id = of_alias_get_id(host->dev->of_node, "mshc");
-               if (ctrl_id < 0)
-                       ctrl_id = 0;
-       } else {
+       if (host->dev->of_node)
+               ctrl_id = mmc->index;
+       else
                ctrl_id = to_platform_device(host->dev)->id;
-       }
 
        if (drv_data && drv_data->caps) {
                if (ctrl_id >= drv_data->num_caps) {