Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yangtao Li <frank.li@vivo.com>
To:     Adrian Hunter <adrian.hunter@intel.com>,
        Ulf Hansson <ulf.hansson@linaro.org>
Cc:     Yangtao Li <frank.li@vivo.com>,
        =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 
        <u.kleine-koenig@pengutronix.de>, linux-mmc@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH v3 59/62] mmc: sdhci_am654: Properly handle failures in .remove()
Date:   Thu, 27 Jul 2023 15:00:48 +0800
Message-Id: <20230727070051.17778-59-frank.li@vivo.com>
In-Reply-To: <20230727070051.17778-1-frank.li@vivo.com>
References: <20230727070051.17778-1-frank.li@vivo.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a2xkWFNSNTlqWEVtN1gvaFpBYUxXblVUNndkZVBxQlpEWVl0NVRrQ0Q4T0tO?=
 =?utf-8?B?ZjZjRC9URkR6MmYyamxqcitDK3dSempLZUJDTTFEaGtZaVVCdzg4QlU2WG5i?=
 =?utf-8?B?bGNYSFd5QzQ3eGdTSS82aVBFZ210NHR6dzMvT2hqeUQzQ25SakxyckdSTW1o?=
 =?utf-8?B?OFFiWVREN09wUDFwczVLaVpmc1RrM1YxRTlVdk1XMjdJaFIyZnBaNzB3aXVm?=
 =?utf-8?B?RlRWMzkxU0ZmZk12akJ6R0dMb0dLSTVtTGhhVzlTTDFVSGZLYkpZUnY2d2Ux?=
 =?utf-8?B?UW9WQWRDNTZxcyt2ZFRHMmcvRTZEVnIvVnM0WS9pSmZCS0tyNjB1RzlvMDE3?=
 =?utf-8?B?OUJWTkhENXBqckZSME9OaStPeWxaa3UzTDJUVWVWYzdVKzR2VjJDb3gyL0NR?=
 =?utf-8?B?WHJPVEpERHpTTVA0Znp4RjJ1NjNGM0xLeG9NOWE4a05WT0tnQzRtQzJhZGV1?=
 =?utf-8?B?eHIrcTRXQlBNNXlzbTZlODVQdTJ2VUY0cEpvdkFhei9oeHVzS1VrL3FxVkR3?=
 =?utf-8?B?Nll3TWY2US9xekx3dFAwUFd4TzM1dDFRMDFPWlBnWVErRTI0TDF4blFIbVpu?=
 =?utf-8?B?ZUprS2U3Qk9XOXdkNVRZUmJYQjQwV2QweHQzbm52MUI5ZUNSSElya2YxUWVj?=
 =?utf-8?B?UjFZdzlaNm56VWFDZkJtY3JkSXFuZzZ3cnhQY3NjZ0dWL1dHWGlCQUFZVXhn?=
 =?utf-8?B?L1pKRVI5MnQxY0VvM0VYMklzVjJ0WGtkUWk1NE9lQ1RkNXlzRUFHMDRsS1h4?=
 =?utf-8?B?SUdzSlcxcHBSK1BvSHArNzZKMXlOVTBUSjlXY1VIYmtwMTZ6ak52eTB5S1dh?=
 =?utf-8?B?T00xQ3U5UG9TM3QxNHhjMDlYMVpjRTdIYTBxenRoRkhDQ2dZaXZURG9WSjZ4?=
 =?utf-8?B?eXpUNDdVaUd0NzFDN2VDQ2lwV2dGYjlsMTZmWjk1YTlWM3FDVE5yZ0lGdGNF?=
 =?utf-8?B?Zk0rUDNPOHlJNy9LYzFaR2F4bTFTT1JvdFN0Y1k4VWd6S0w0elFVTkN5cWQ5?=
 =?utf-8?B?a3FmSjBBc3FJV25hdkJBOGtXbkQ1WUl5VEsvTTlSWVo1NWY3M1dMUzV4ejdD?=
 =?utf-8?B?ZkZNcTI0UFo0Zm5uUXBLeGhUbEoxRUc3OWllaEdZZzVnbWxwZUZCZ1NTenA1?=
 =?utf-8?B?TXNlM0o3c2FkNW1Iek1SR0VJZGxUMHpqM1B2SGVDREtEYVZ5S1ZQUlAvMEov?=
 =?utf-8?B?aDlRVWkzNy9hV3JPMHlYVkVMd0paWkorU3FQV3I3c08vSTVtM1IvS3crYXFP?=
 =?utf-8?B?UkFOd2NibW15NzlLRU90eXgzLzFtQjR3S1psWWFnbHZZQzROSWN0cGlveWNz?=
 =?utf-8?B?UHMwRVhsMnEvMVduQzRYYjRtOUNKOEMwVW51aXpJQ1J6T0JMNnU2U1BCQVN3?=
 =?utf-8?B?d0lacXdrT0doTFp2QVNHYnZ1MkQzdXJna1J0cmZ4ZytZa2MzVzZ3aWVTUnZB?=
 =?utf-8?B?K0hsTmo0ZDl2MEVES2xEQ1NpNXkybXF2WDNuWFdDa2dGRTZiaHV4LzhKZ0lo?=
 =?utf-8?B?aWtXcU5Iem54TTVuMEZYdVBwUlZHbkF1VWJBUUFhTjZTMEx0OVlNbmxxZk94?=
 =?utf-8?B?VkU2Y1VrTVlSN09GWXhLZUhPMkVsVnltYjBGalRvL1pFSkdoY1l4eVpOb3M1?=
 =?utf-8?B?MFFrUHE3c2ZVVVBkNzQyQmhwVDhzMEgwZG53cVhYbm4xRFZ3bVlMeFZnbXUr?=
 =?utf-8?B?dHIycFpYNXdpOHRPYXBQbEd1THJ2OEZqVG1CVVhNcWYrbW9JTU5DS0w3Qk5J?=
 =?utf-8?B?WG9BbjlmdXltaldKRmI1d1JqNDZzeXlDUGd1Z1dRaCtTTVp3cklmU0FQZVVh?=
 =?utf-8?B?N21la0ZUb0R2bDVXdWtZWW9YYUgva3VacG5adWI5SjlQMXBIdCtrQjNRakh5?=
 =?utf-8?B?M1ArWlBqemtnNFVBMW5heW8xMFI2c3A0ZHVGNWk0SVlsYkM0WEtVU3FjN2Vn?=
 =?utf-8?B?YW9ZMVdnYU1GSlhnVWZDeTBwMDJWeDdwLy93MGNaUWxQVmduTnVuVTgyNnZR?=
 =?utf-8?B?b3duYVdac2ZXNk5pbFpGT1VYbGdyZmpobGJzbnkrM21wS2F4ZXp4SUpyUjlF?=
 =?utf-8?B?eGQza2VTQ2lHQ3FsSWt2SS8vR0ZWeGtFa1NLWWxMdDNrd0IyZGR0WVlzU3Zs?=
 =?utf-8?Q?zx6EaVu3d9QfgwlZUi/fh0JS2?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: afaafa2a-a1df-406b-e7c6-08db8e6f798a
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2023 07:02:43.6893
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: DKFCjM3yAPKXNTcm+9+ZYdlmR4IEkMDe8J46lnS4KWVknFJv2Q8R8HROkkunF4s8ATzAWhGELBuhOTuO2z4gTg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB4152
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Returning an error code in a platform driver's remove function is wrong
most of the time and there is an effort to make the callback return
void. To prepare this rework the function not to exit early.

Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/mmc/host/sdhci_am654.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 7cdf0f54e3a5..1cc84739ef2f 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -870,16 +870,17 @@ static int sdhci_am654_remove(struct platform_device *pdev)
 {
 	struct sdhci_host *host = platform_get_drvdata(pdev);
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct device *dev = &pdev->dev;
 	int ret;
 
-	ret = pm_runtime_resume_and_get(&pdev->dev);
+	ret = pm_runtime_get_sync(dev);
 	if (ret < 0)
-		return ret;
+		dev_err(dev, "pm_runtime_get_sync() Failed\n");
 
 	sdhci_remove_host(host, true);
 	clk_disable_unprepare(pltfm_host->clk);
-	pm_runtime_disable(&pdev->dev);
-	pm_runtime_put_noidle(&pdev->dev);
+	pm_runtime_disable(dev);
+	pm_runtime_put_noidle(dev);
 	sdhci_pltfm_free(pdev);
 	return 0;
 }
-- 
2.39.0