From patchwork Thu Jul 27 07:00:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5p2O5oms6Z+s?= X-Patchwork-Id: 126712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp910040vqo; Thu, 27 Jul 2023 00:11:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlEE6NnxXyocQrZ87uuOdOTYeHUDl16Amx/2WWYO92RQBRFQyVPcfN/q/cfqd2kLClv7D6y/ X-Received: by 2002:a17:906:74de:b0:997:e836:6bb with SMTP id z30-20020a17090674de00b00997e83606bbmr1469403ejl.14.1690441912645; Thu, 27 Jul 2023 00:11:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1690441912; cv=pass; d=google.com; s=arc-20160816; b=lLVPhl0TXVtZEMmzBwAR9X/iXtYFyAmZXJ6UMYhuJCw9FPpOhiGeiZFuZWf3hruxPI Aa1yTmph6HGqp/MtYl93gE+Yddzq1aFajDuDru0e+TPdL8wQmGQXmrQN36e6DUyXxjeb VNU56PbDN4l4BvItt1ivIWzUxsi2yJIHrTmcfB4m7Yz5pIvH+0zp389zonJtV4kDfz+Q yY/U/kAdCEbNafLY13Sc1taAwthyS6g/G9afGIDyspVQI99hf06BykRueDmnfrrjWoKf NX25gucoWhgzl2IYSnEh5SrCJ6yyeIUyI1zvC3lJ4iFwVWVsYD4SeEzw2fE2egjqaTEF S+9A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ky6VZARD/+JhPhEudXHQb/Xqz7DgERGqgfv+ZV13owc=; fh=Fr/deOztmOQctDBpTaSaXkRsYUOXrO8CEYa9gC+nNgI=; b=rghWiBk3a2Al/ll3uhZw02ZiblmCXX9mwPUlPe/9U1SjYFdCwcIC3Kr6uoXbkX9ZZF wBYm/oEu5JpV0aCn+jBkEa6wQCtb/28PQfAnegbXUHULxXbph2beNz1cGoXwqQbV9ak/ iGAW+SaWgZEIb7kpuAiP+6hLnRLxgOw605G6Wiphvlt6w+4RRIRL/M3jnIJszUF5abon apAZoOd3WYQwJTeKZ2z7ysc0MyKL7XB0+T1BsZEVTTGrTtaiDgNjxxc3bDLeXRVi7PmO I9E28gdEPcUpOg885EYQBN5jz8/21Jn07dPqi7DnK5UnvkEcbHzQXa6PE+z+jDkrLy7g JrIw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=N5lBB5hC; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i9-20020a17090685c900b0099b422f9c93si566910ejy.524.2023.07.27.00.11.28; Thu, 27 Jul 2023 00:11:52 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=N5lBB5hC; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232954AbjG0HGN (ORCPT + 99 others); Thu, 27 Jul 2023 03:06:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232882AbjG0HFB (ORCPT ); Thu, 27 Jul 2023 03:05:01 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on20700.outbound.protection.outlook.com [IPv6:2a01:111:f400:feab::700]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64A093ABD; Thu, 27 Jul 2023 00:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GF1y6zdQxyWutIiU3x+EildjwOF4AeBz+YPS7G9hNB8ni9Mv3yMXNECO3B5Y5SEL6QqRX81Rw+BYqb4tZkDsBWLugmJoWVq/XoYaDCr6MrvsfMkZd8gmWFAF/2Rp3I5zAimnwxLgKlkpLSZ1Z4a+a2yJ4SnSIVY14c6c6tQPAGM4Vp2UTZANb0duF6qY6qS1hdHnUU3zy2JGeHblXN75hiOqJw1RcDlFnre/027j+tNbqsIVCYsbPiyjYlDBn3kGBDtWPsjDCG89499P0PFHelPu6NRWk045moWQ7UGV/rICTH6mfJTWbytBn870GNdNk9wLgn7dm2MN/aYZw0TXdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ky6VZARD/+JhPhEudXHQb/Xqz7DgERGqgfv+ZV13owc=; b=jURD9EmBdSOX67XQCqiI52jxulKiuIkKVG+igE2OfT9VlXiG+agbXR+QOVvjORqUbam9ivTc0JlqKbj9IR1mGABtlo5fetw663rPjX1lSwybwJIG/I3sV+T34b54NreHvjgzuDaJ+vFoHvmWIQ/L2N1Kd1tG7fMAG4RgajnYuSm5AYv6gM9WU6mG0sefKZFcOMy0W/gxrslPo7U5twPzTg7odDXvHktxqMDsolBvGFh+SpJAapXtrV/ndLVPFGTkFdPlUULqiaJifGZ4bN3ftwPXDwUS9RTGfbtNVn3/W4eSzIVs591OpsaXKGBN0K9PBw+NEFnLaacNRD0viaizvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ky6VZARD/+JhPhEudXHQb/Xqz7DgERGqgfv+ZV13owc=; b=N5lBB5hCooH5YyLMTlmX3XrlKIOmRRi9yPoIeCmzwlm6R/JnTTWFQwlq2Yn7NpKVmm8J9nIdU1FJnejKQGjJN1SkM9N5Bja4Tp6LVFbCe1JneawVB+vRbHtFoF/D3p1cnDBW6kuwaWBqWFuTExH37C8/Zhc0l/tG1KsbwDDYeQjlMwEduhD6M+mIwjBh28hZiJLsXWocvfe9MWLDtr8vPfb53+4cE8p3p7DaDTEFE5rQySZJDYFA1X8tl+GSVlDGdf4kdBcSO9F09AbIr0t/qEg4ICuk7hSqL38jcpxJDEAScoaMcMy5ur01pQ6vdlkfniJiqE7Vdk7W83+FPYn4BA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by TYUPR06MB6027.apcprd06.prod.outlook.com (2603:1096:400:351::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Thu, 27 Jul 2023 07:01:57 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::732f:ea1d:45a1:1e0b]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::732f:ea1d:45a1:1e0b%3]) with mapi id 15.20.6631.026; Thu, 27 Jul 2023 07:01:57 +0000 From: Yangtao Li To: Adrian Hunter , Andrew Jeffery , Ulf Hansson , Joel Stanley Cc: Yangtao Li , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-mmc@vger.kernel.org, linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 33/62] mmc: sdhci-of-aspeed: Convert to platform remove Date: Thu, 27 Jul 2023 15:00:22 +0800 Message-Id: <20230727070051.17778-33-frank.li@vivo.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230727070051.17778-1-frank.li@vivo.com> References: <20230727070051.17778-1-frank.li@vivo.com> X-ClientProxiedBy: SI2P153CA0017.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::10) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|TYUPR06MB6027:EE_ X-MS-Office365-Filtering-Correlation-Id: a24d2538-caee-4288-e14b-08db8e6f5df3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jEldcW3C4DL4Ne1aYPGoF6kK/pcTDSQqE4JOFGTmpVt13r679qt4OjiWicWYIqUzvJq8JKBOtdmT0r20+wCVLj9VRjdibK8UaEmRRqeYwkCd+6XA6iFTfaDuRhncLa7fEkXUV71mxshcnpgQqq0ymMSjrYTchgKd/E9oviQJDTcaded6D8EosLsCUI/k29OsIPF8cqCebE++pt0Qv6ypCIy+gEL5/1oBqNtu32G1BIwyQGwD1gKi+phr6550h2I6Lh4WsYSkvRSuhuHRtf8KGkSHrnk6dQzyM1koNQA8qrhh3s+2S3Kr69jyDJeZBAiSerGOOVCd+V8R0lEeCc9EMUHKef3bliYIgeftBFLQ15K5PFBpuVfseUxvvSEzcNMxnv14kOFWeM6k61WlF+ZwJ3g+r+zXsyAMuiaGfI4c8Sxa7OWA5vZYrTRwY7DFugVwCH2saI0/vogF+9CXXrb7/P7DiNIt2khGhwOKqLz4BfR8BhUf2NzBZWVwQDmn3qIDn9qP0Zx3C6evX9GaxE/h5FxZY05GEeN3MbTHzpM3E9OIqIlDtjGIIzSHVHip2NrouEaMHiYeJqA95ibQHQWqggKDrpjNU/4V7eSIvRJ+Hcz+SYNZcKgUXr7cvJiH4PxV X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(366004)(136003)(346002)(39860400002)(396003)(451199021)(2906002)(1076003)(6506007)(26005)(186003)(86362001)(316002)(38350700002)(38100700002)(2616005)(83380400001)(5660300002)(66946007)(41300700001)(66556008)(66476007)(8676002)(36756003)(8936002)(7416002)(52116002)(110136005)(6512007)(6666004)(4326008)(6486002)(478600001)(54906003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?tA5L5hWN3Wy2Kt6dlGtl72XvHvWj?= =?utf-8?q?3HrYxyOPAkgmiO6zaJsBQq6GlDJkxU5FJF0ES5lMyUqsHb0cLCE/uGoPs10rUdnbX?= =?utf-8?q?3Z2D/yanQHOii+31UoEiYfq+o47fPgbiKKcIJ8GRlF6qA7SHAZXKz8VGqT3Ox8n97?= =?utf-8?q?GJgkALgQifiZxnVWVP6n5Y7lvM5DPauyEO8mPgs9fEIkmtTdBEP4+vUrciDe3ahSc?= =?utf-8?q?xBtN5/AVySxk0QRE3C15oqcZvjaEIBXH5mTZgZBwIcyHhlbP6HXH6JkqfpuFHVqOD?= =?utf-8?q?5fVTHmH/gkz0mQcSND9aXG0CehPLx9CA3jDRJX7cbOvwfZjYEfN7KcDufjpe4351Z?= =?utf-8?q?4Zb+UhtGUXzCCnCjXsy9SIDvcfcU+gyM0EYAnjarmAbER1etF3WHnlRez+IO/BDOg?= =?utf-8?q?2mKNgV2eVjrsCg5Sq2YGVtwFinxRCvLg6nxae67ljnAnRrib9DkaEWyoqO99BLiEz?= =?utf-8?q?T/ROb3mRPx5pVqWvcG7oyECmcCg/mNuhPSkqkkElaGm2TeqAASEhKzg7kx1RRfvKk?= =?utf-8?q?HY5P6ZIlp+4DFHp7FLxMsvyLljFx8kda3bS7GCgcIcPz+SGWta/CHqKl21JI5RWwW?= =?utf-8?q?DRKEvNHQseXu47es4pndj/ZVbiq+yKOP+Og8XGYKN61lsYQyPNpufMFPu5honIZju?= =?utf-8?q?oE9G+dPAcfvciBGhYDXk8+y1K3UJ2kGzesw+/k78HJ53VuvQGz9YkQclPXmJhjaUy?= =?utf-8?q?Y6jb4Hcww+/3HNksUR64afLLJZRkKtIz3yySM4qi62n4TU41PDVbCsUmeqFdz+mnc?= =?utf-8?q?Covr5Ao7pQOxxgbzhG+tQM3emXHexUTxBIOPFJBD2Fldwz8PZtKDx6DmO43ICTA7L?= =?utf-8?q?V7vSazwRqafhdA8DHIsedg/43jFk61Hg3C7+Jcocymye/OD1WG40FUpH5n8NmsgMg?= =?utf-8?q?0q1fVvXdS8SPozyZsxcU7BSg3kuiaLDjI+QAbqwCA+Ga8hp0BarsLlJVDA//HzBdL?= =?utf-8?q?rsI3t9OjDbJYip+YG/bUOjhykJr/wYPBZueWZh4bejKmgHw7Hc5g2dWNE90nEeMgU?= =?utf-8?q?vPLp8iJBKEq9YykcpqSMA/vrWHuPPCy45O2eLH3Vl4dnz/Eu1UjZv+9W2NlWBCRF+?= =?utf-8?q?SZHNyI/59prOe/Qi2R6zgUN9EIydgOiHI2IYQRkfVBqREb4Hh+Zqp6l9NDf4rR37z?= =?utf-8?q?2ipGAeniS1B43d3lwm5pu2qu0aOPuZ4Gw3prpHKqdKkQeDELrIgs/Lz8gcVOLgm78?= =?utf-8?q?n1vzlABJ3AHXK16RxsbzEJ/inqcOcK3g5MrRcQlM4LhBtgBogSNiizxV1IcW26K7H?= =?utf-8?q?fdEnMeRedmrflpwz0AZ++G/jW3MS18HM9fx9LwjlM960Udc1Xu2Vnx/A0F1WMozgy?= =?utf-8?q?JAGKjKC0phuvrxczQDl6c3IexhiKjCIk8VLq1j8y0ZzCcpZ/6kZdKFFpd2c03ADdp?= =?utf-8?q?GYnS3TgNhwmyCJYdy184LpqyZ343cE5oLI53MKOLud3WL9VLDoX55q7FgFVub1IIn?= =?utf-8?q?i11EQhLIUsZAifckpg7VluSegyc2isJul2xuy2WFyrtiWxWBOkkdnlHJhbNXQ59YS?= =?utf-8?q?ozILcxH1pxa8?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a24d2538-caee-4288-e14b-08db8e6f5df3 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:01:57.3128 (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: XQrPUbk+4XE1Esq4cjs3HG4fCUhRQe1m+ffc55Vfhw2oGgf4ImVhDcHCESo1s+sAqbMQszaCEJ7OVJAr75dG9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB6027 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, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772556818715112822 X-GMAIL-MSGID: 1772556818715112822 The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Cc: Uwe Kleine-König Signed-off-by: Yangtao Li Acked-by: Adrian Hunter --- drivers/mmc/host/sdhci-of-aspeed.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c index b4867bb4a564..42d54532cabe 100644 --- a/drivers/mmc/host/sdhci-of-aspeed.c +++ b/drivers/mmc/host/sdhci-of-aspeed.c @@ -450,7 +450,7 @@ static int aspeed_sdhci_probe(struct platform_device *pdev) return ret; } -static int aspeed_sdhci_remove(struct platform_device *pdev) +static void aspeed_sdhci_remove(struct platform_device *pdev) { struct sdhci_pltfm_host *pltfm_host; struct sdhci_host *host; @@ -463,8 +463,6 @@ static int aspeed_sdhci_remove(struct platform_device *pdev) clk_disable_unprepare(pltfm_host->clk); sdhci_pltfm_free(pdev); - - return 0; } static const struct aspeed_sdhci_pdata ast2400_sdhci_pdata = { @@ -520,7 +518,7 @@ static struct platform_driver aspeed_sdhci_driver = { .of_match_table = aspeed_sdhci_of_match, }, .probe = aspeed_sdhci_probe, - .remove = aspeed_sdhci_remove, + .remove_new = aspeed_sdhci_remove, }; static int aspeed_sdc_probe(struct platform_device *pdev) @@ -573,13 +571,11 @@ static int aspeed_sdc_probe(struct platform_device *pdev) return ret; } -static int aspeed_sdc_remove(struct platform_device *pdev) +static void aspeed_sdc_remove(struct platform_device *pdev) { struct aspeed_sdc *sdc = dev_get_drvdata(&pdev->dev); clk_disable_unprepare(sdc->clk); - - return 0; } static const struct of_device_id aspeed_sdc_of_match[] = { @@ -599,7 +595,7 @@ static struct platform_driver aspeed_sdc_driver = { .of_match_table = aspeed_sdc_of_match, }, .probe = aspeed_sdc_probe, - .remove = aspeed_sdc_remove, + .remove_new = aspeed_sdc_remove, }; #if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)