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:     Alan Stern <stern@rowland.harvard.edu>,
        Patrice Chotard <patrice.chotard@foss.st.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-usb@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 28/30] usb: ehci-st: Use devm_platform_get_and_ioremap_resource()
Date:   Wed, 26 Jul 2023 19:38:14 +0800
Message-Id: <20230726113816.888-28-frank.li@vivo.com>
In-Reply-To: <20230726113816.888-1-frank.li@vivo.com>
References: <20230726113816.888-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LobCdko0s++Jgkq2ZXj/KUuPYJOJJLTWr4B/CXOFUNEemoaxW2ar1UNKjYYf?=
 =?us-ascii?Q?5SstIOVuX36N1EPvkFcarFcN277wJr+CNU86rZqYzrflcQRwlQta7FwnVnuh?=
 =?us-ascii?Q?c6JEUU0BL1+jInVOVpR98I2J+0QigfwD153cwCNOXaUJZfi8s6XwxNtRhiQw?=
 =?us-ascii?Q?jNqhOFFWK2ngdZxXf1/PiUP96JHv6TsOwlGm5UTf1kf2z1lnFiWOj6AV6gZ1?=
 =?us-ascii?Q?TfYbcCto8srFuP+15kyg5XOctnGaOmAuWxX1vCFP6PmVStG2pfzVtMGpqtH+?=
 =?us-ascii?Q?l9LVZ4mm00H89wuha+S1QW3tEPa07VQcfRX8MkcsR0yHhEn5IeTPP3qZ9NUO?=
 =?us-ascii?Q?uzDnrC40duMeyaMAGtFJQ7jYXVAhg1SlaZ1+Upxee/MEwoEchiB2y1iTwNQL?=
 =?us-ascii?Q?x92bMq+VW4XToJprq4hZw4thwmsDn2uGz0u02EVN60zkBm060ttg/Qpbz5W6?=
 =?us-ascii?Q?34OsUpl9HUNIRDZbNGc6Yei9AcKf7Z5LhoHFUmprXCki5ehLvyG3HYfDxfE3?=
 =?us-ascii?Q?SCnIQT+aYoZ+0TjgrLLDULMqcfQo7mC2avz9uj0pAFlLIThtRy+dexPbuUcE?=
 =?us-ascii?Q?JuP2vjcUuvKTBsWZyPfTfgImZQT+SoHmKsBZ0ctzfWWHkE8r4odSJp/CLfHn?=
 =?us-ascii?Q?KSDGM+aEQZcYYDvQY32zFz8ko1dGYr4FTLk5vQolDtOEOrn40yNL52u5+u3P?=
 =?us-ascii?Q?A0b9WlBDl5KGHLYnrkt1koCYpZKi4Za2gy/j/4SgHUD81rDH49te3+xzgH3D?=
 =?us-ascii?Q?1jPgiKM/0B90ANeFFEhUd5MpFVqUVhR90q4fKQu7fozLMeJ1ELlQ3VmyiuMA?=
 =?us-ascii?Q?P7pmMPdfxJpzpowXts2t+tmtDhcOP/LdZ/Mb99QeIvceWeeJd3X9pU4n2ioS?=
 =?us-ascii?Q?RqGPpmfcIOcSEO+7ZXyMUdBzQCj4P/uz3fXOfx4noAWFeyOp8ghkuzAZpcVu?=
 =?us-ascii?Q?zpqdij8NSCm4ntrm25dIAak5Gm/dRtUQgfKwbnxkOaAHIrTofhSMFDZgo42x?=
 =?us-ascii?Q?0jA+6vkfjiL5jF1uw5ahM9Zb3UC8VV7ZnMvAeiCmAH1HEBl50bHDC8musi0l?=
 =?us-ascii?Q?DxPntW2P/BDlb9pBMJbVEQRnz+13vXTh9XflyZta5tZEnGKkBi9/iiJcPvH1?=
 =?us-ascii?Q?jC5xbIpb8D0Rj6DYuEhvs6ZaGZTN9tbEl/4JV8vS/rVmp+ym4DUsOMekXlkJ?=
 =?us-ascii?Q?EUBmGpFgYwV1YN/GLm+tZEwFvLB+/dXHF7bHuPERalHPRqLELftnmOXqHzBV?=
 =?us-ascii?Q?H9Tk4YZq98vReL8/2OKU7jGdEZvrAWSh6EPlaYB2FcUxQcK3VnptOMNIcee7?=
 =?us-ascii?Q?2GXPvBGm6OFNAN45aU9sRVrsoDzZn9OIAvidm2N7ikodEGWixLPABkPW8V+q?=
 =?us-ascii?Q?/sfM/NU3jpcJ/vE7WgioHladNDi5PYG1q9WbiJv0mnDiz37Gg4avPWAdzVs6?=
 =?us-ascii?Q?dwE2zOyAEpyhQgHZlBPlfZh+yy2vvuzfSKJekXD7YKN2iN+YsBEuDcQN21xj?=
 =?us-ascii?Q?biqcaA3mr87+PqgX888u4bTm1dqDrkF5mYpvgS2JH1vUoKGFqWlB9u/b5ekr?=
 =?us-ascii?Q?ePXHTkz4BKXAaYij23hr/fe+B/8ucEn6MKUfu49E?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8499fd39-ddf3-4163-b055-08db8dcced16
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 11:39:09.4879
 (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: AxV3iY8qeWG5mBSz4ZJfgjfcd735ebgIsxSuEFMQN/4RpfTUDum5dxa1uY0BHr47qHq9QwhW9/E5QtCXnPuL1w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4203
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/usb/host/ehci-st.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c
index ee0976b815b4..2dbb0d86daaa 100644
--- a/drivers/usb/host/ehci-st.c
+++ b/drivers/usb/host/ehci-st.c
@@ -158,11 +158,6 @@ static int st_ehci_platform_probe(struct platform_device *dev)
 	irq = platform_get_irq(dev, 0);
 	if (irq < 0)
 		return irq;
-	res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
-	if (!res_mem) {
-		dev_err(&dev->dev, "no memory resource provided");
-		return -ENXIO;
-	}
 
 	hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev,
 			     dev_name(&dev->dev));
@@ -222,14 +217,13 @@ static int st_ehci_platform_probe(struct platform_device *dev)
 			goto err_put_clks;
 	}
 
-	hcd->rsrc_start = res_mem->start;
-	hcd->rsrc_len = resource_size(res_mem);
-
-	hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
+	hcd->regs = devm_platform_get_and_ioremap_resource(dev, 0, &res_mem);
 	if (IS_ERR(hcd->regs)) {
 		err = PTR_ERR(hcd->regs);
 		goto err_put_clks;
 	}
+	hcd->rsrc_start = res_mem->start;
+	hcd->rsrc_len = resource_size(res_mem);
 
 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (err)
-- 
2.39.0