From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Mon, 13 Feb 2023 23:19:41 +0000 (+0100)
Subject: mmc: Merge branch fixes into next
X-Git-Tag: v6.3-rc1~63^2~20
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fe3e137c6d7106d67f37cb76781b90f90a4e988f;p=tomoyo%2Ftomoyo-test1.git

mmc: Merge branch fixes into next

Merge the mmc fixes for v6.2-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.3.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

fe3e137c6d7106d67f37cb76781b90f90a4e988f
diff --cc drivers/mmc/host/meson-gx-mmc.c
index 96115bfdf794,5c94ad4661ce..6a63592ec121
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@@ -1195,20 -1198,32 +1198,25 @@@ static int meson_mmc_probe(struct platf
  	host->vqmmc_enabled = false;
  	ret = mmc_regulator_get_supply(mmc);
  	if (ret)
 -		goto free_host;
 +		return ret;
  
  	ret = mmc_of_parse(mmc);
 -	if (ret) {
 -		if (ret != -EPROBE_DEFER)
 -			dev_warn(&pdev->dev, "error parsing DT: %d\n", ret);
 -		goto free_host;
 -	}
 +	if (ret)
 +		return dev_err_probe(&pdev->dev, ret, "error parsing DT\n");
  
+ 	mmc->caps |= MMC_CAP_CMD23;
+ 
+ 	if (mmc->caps & MMC_CAP_SDIO_IRQ)
+ 		mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
+ 
  	host->data = (struct meson_mmc_data *)
  		of_device_get_match_data(&pdev->dev);
 -	if (!host->data) {
 -		ret = -EINVAL;
 -		goto free_host;
 -	}
 +	if (!host->data)
 +		return -EINVAL;
  
  	ret = device_reset_optional(&pdev->dev);
 -	if (ret) {
 -		dev_err_probe(&pdev->dev, ret, "device reset failed\n");
 -		goto free_host;
 -	}
 +	if (ret)
 +		return dev_err_probe(&pdev->dev, ret, "device reset failed\n");
  
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	host->regs = devm_ioremap_resource(&pdev->dev, res);