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-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 30/30] usb: ohci-st: Use devm_platform_get_and_ioremap_resource()
Date:   Wed, 26 Jul 2023 19:38:16 +0800
Message-Id: <20230726113816.888-30-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?Ah32Gl0I2YipW33MKvgVLQGqrQN9CtgWy9Q/ZKP55wa31GEpYDxQTUghZ1XF?=
 =?us-ascii?Q?tmchUjqZg5EPfy8vUru2A2wGnhBH+cGqwargmx9vsLwdF51J+RGvKGwuDx9S?=
 =?us-ascii?Q?fJ/KT7YbSRGjj77wVlVH3S4NP6xnV6TykM4th+FVODlRDih0weany6cZSfdg?=
 =?us-ascii?Q?Bz5MWyUb7dTaAmY6R36fKt0EXb8D/bXnRt15qYexAJwn2Bym8yQ0EKwXVW+a?=
 =?us-ascii?Q?apJu21nNG7BgmSIO6F9LXTM7u4DGZZdQnbZOlPU9icNjMf7bta7eotn89K0i?=
 =?us-ascii?Q?GkS/rOEZ7GLoF5Gm62vGK9TAAQtUUcGEqk7Px3lUgVaq3cl3A8hH2PNwX3bb?=
 =?us-ascii?Q?6YMDmQjoJes9QEa6N5yZWsLCfkS19xU1MZVRZyPmW9MzV4VKnBQTgiFZY9o/?=
 =?us-ascii?Q?826IbV6Tg9YXiQUQ+YrhULX/BIUioSN5aT5sxCJguvJ2WyXVYmijU9sJ+I22?=
 =?us-ascii?Q?T5HsgdADNvoUD8FbPfwhvfEs26Uw9sushRiB+xgjAYK79eocDqfR9G21ps5v?=
 =?us-ascii?Q?FMCCfzuNbVfX3f4jTHu3/BiaWpB/DVpXWyEEVsQx+Qu+VPBcKGFj83abRXGB?=
 =?us-ascii?Q?ldD7zcE0ekuJmRejKTSgvwoX+2igFjohS6mK8xx8RnLR634ufpq5p+8qQ2iR?=
 =?us-ascii?Q?V62YkPzcqsHO9qm2GM7hnFFJ7bcYe5pQgS9Gxi+TZVwxhCVp1CvnFSewokSO?=
 =?us-ascii?Q?7MfltTOTsqZgrZQuX3ldQTj+zpN3D8QTeDQFLMIFpN0PINu4sL3BZUXIToHw?=
 =?us-ascii?Q?KLnM4v84T2wyEIYhwycpDTnyhbbmktNH+SObSwCQGChhMaxiRE04MqqV179Y?=
 =?us-ascii?Q?iUjHD9qsQkXdUi4xXHuECsnTNTX+PlVrU8APkYjaU5wcnc1KSNg0EDmMkckV?=
 =?us-ascii?Q?0gTq4LvyTr2+cuEGwKeohnkUPXr8bp3zCCfGALbZ69gCD+ZMKYHiBPQ9Vx99?=
 =?us-ascii?Q?ACXE0BpRV+6nD+uK47OSi+APGC6UPULigrw7mc9o3GFIay8BXlrFMuDf8H4N?=
 =?us-ascii?Q?yOspvNyCPcq99ups4Ew74h2wuVkU2ThiYm/km1B0+mDMn7oZ4p5FvnC1Krx8?=
 =?us-ascii?Q?aTARY4wx10b1d73MXCQw4I/2jMEEunckYTFpWtI0U3gC4DJ22YeW6bEHquHT?=
 =?us-ascii?Q?9EtlaMouUROdjgE5+Jzyq3oagxTykroPjgQYEJGceFBnlmValheCOtaqsoeJ?=
 =?us-ascii?Q?+tkJl43C8xuQ3x4/O3BQnzXg+pHBxxotYOL/2TqLt7NLB5FMNRZESUzwaSEs?=
 =?us-ascii?Q?YoGryFcvL0k9uAyvVjeTSAfH0uIHyu1dIuBYr+wXq3xTH6G0WkZzwlHWAJTY?=
 =?us-ascii?Q?IiOxswP9FKmc4ujNXaUcYP8m6+y2Gmia7lwUdeBbqx++nh+OwVSOsU2kcWNh?=
 =?us-ascii?Q?NHdTvWKWiG+RjJgW9V1MVchrLyJiQFPM9iy34aj0edhUVV6Tfy++8oE61EEI?=
 =?us-ascii?Q?QhQdX1FBaxrI++xGkeqrMi4MkCAbM3MQ5J3TmVykFkFxk2jw4WnPc4X2amIG?=
 =?us-ascii?Q?QQ38wyg0yW1VhJPfIye7iP6WaEPr/ex4SRRMcV8SnNAMYjNNAjzwuVAwYhQ4?=
 =?us-ascii?Q?7GX5GpDIhLjTcfOBI3rbrpK0Q0iZwD0TZjUGEuWV?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 98556862-a92e-4036-7b74-08db8dccef44
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:13.1558
 (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: T/f9gLI8Ij6g0HVBsLxNYNSunlb59bZqFdz0Vb7+IuxGUXmJ2PHzHpcidNvkqg1NyVCaegU6lw2NiOuG1tGLgw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6280
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/ohci-st.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c
index 884e447a8098..214342013f7e 100644
--- a/drivers/usb/host/ohci-st.c
+++ b/drivers/usb/host/ohci-st.c
@@ -139,12 +139,6 @@ static int st_ohci_platform_probe(struct platform_device *dev)
 	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(&ohci_platform_hc_driver, &dev->dev,
 			dev_name(&dev->dev));
 	if (!hcd)
@@ -199,14 +193,14 @@ static int st_ohci_platform_probe(struct platform_device *dev)
 			goto err_power;
 	}
 
-	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_power;
 	}
+	hcd->rsrc_start = res_mem->start;
+	hcd->rsrc_len = resource_size(res_mem);
+
 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (err)
 		goto err_power;
-- 
2.39.0