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:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jirislaby@kernel.org>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul.walmsley@sifive.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-serial@vger.kernel.org,
        linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 13/15] serial: sifive: Use devm_platform_get_and_ioremap_resource()
Date:   Wed, 12 Jul 2023 14:28:51 +0800
Message-Id: <20230712062853.11007-13-frank.li@vivo.com>
In-Reply-To: <20230712062853.11007-1-frank.li@vivo.com>
References: <20230712062853.11007-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?k2/D+aimpvP96QLCaOwOz6nNbAiT78ZOtBK22pBI7u+ONblJtdUnlZD2lYJZ?=
 =?us-ascii?Q?yG7rX9B59NNQTV3VUsnlgeO+cPrUJZuOupR6qYxSOonG9X+Kv4LcMG0x3u19?=
 =?us-ascii?Q?tC/bDsX6PFd0AoqmnLkx5UPFm6bO7t9t7g56dbxmLWMTg8zYZx7HkuN0qiEy?=
 =?us-ascii?Q?OTj0Y2gm1z2hgyMQDEYqWjFhHjofgECFQBXlfWnhZ/ywRC1kPkH5o3DtExn7?=
 =?us-ascii?Q?Qs8a40AjPfrcbtdVzw3S4JT6LhjPCyTAR+qGBJdqnJjVo9x9EB5r/1s9CZ3K?=
 =?us-ascii?Q?Xx//ZGufkkwBlfvjn7u4rlNjfP+SbhpKH6y6Keiyelqw6uS1KLXULKUIoGmm?=
 =?us-ascii?Q?StHty8LZpgDpM4ldKOw98iIKZ+Ux7niIl7J0qSDskYJ8Nt0ZNsCxxefAV3iC?=
 =?us-ascii?Q?tg5g7Nk0mx/Fs3SyzGgtScNOeV9AwJUCtm9qFRcXseUIcHI1m2bhoA+7Qklu?=
 =?us-ascii?Q?5vP4LLNgrgptffPwBmW/VwgT8dkBjxZomI7MqfKtQKs000DBT/uwTRmF3Pcj?=
 =?us-ascii?Q?XfFvHfn9JUDJHMtG70jbGXq9C8kg9bIPL2WwbpjnG+8dYMVWWLXqii+YmKW9?=
 =?us-ascii?Q?0k4Ea3AMFUNfe+EcMMs0OeGo10DeGnaPabYAoOvOoBnMU/RwvcT8YqjSpud0?=
 =?us-ascii?Q?xPWwGkkfFfge8u4LYMDgfK5BKl1eUMgdsnV7LuF2a7T/YP+GQMK3j4fsFcCF?=
 =?us-ascii?Q?BwuFbyhcm4ov0FW3WfzQ42uJtOKKfwQ3kCbC+da5ARymcDn3BG3TsH4CFF8J?=
 =?us-ascii?Q?E0VSoBOrQ6ozBtCCtxK2l5s7xn4HoGZgSXq53HaHGLLEjyyAVmAprz+zhErw?=
 =?us-ascii?Q?hwbNM6c/zxGfDfbnedVkA+L+qiXbE5LRZ4IdgYulWRtT7f1J9ODB+I9yDjvI?=
 =?us-ascii?Q?VY/aAwkFNK/cFxJaidAz7dCyaasaWcAYz7anL+KvJoZo40SUHPH3N/xE2jBm?=
 =?us-ascii?Q?ENQo5zSdnVgH7hwiVUZwEjNb7mAr10+ZR0snGwSoEzrkdEBhHq6TUYbrtxyk?=
 =?us-ascii?Q?5PXGwQpGNPxeaHFRDejcrfw+bVjNcxHak6wCUb4x64NboOBP4HXAI7WDi4JP?=
 =?us-ascii?Q?WOKsx7Jyi/Cbk1w/JT+Dl8msTa5736tLPuOjSGd7/oPFmXyqcDddMlMUSIk2?=
 =?us-ascii?Q?0liulz8jn0SGBjoyrGdB5XAb/47Xraku7Q5UrSrLl5IN9PbhjitGTQX3kbsK?=
 =?us-ascii?Q?EEdm7XefUlf4and7XDhc5LLKHZiGW6FNmH6q/tD1zGeRZd534zF5+RolG3xh?=
 =?us-ascii?Q?j7LPvMT2qJmvb2RPTd0bFxhTPQKwrT4BVCGGOdV3qhvd19aejblyO7PU++/L?=
 =?us-ascii?Q?GMmoFh+jq8FvgyveYm9+kyCoVAL+L5Dh6GLseS7leve4FATg6Rj+36NZZfDD?=
 =?us-ascii?Q?ERmRl5VNrVbiET9fg5rSKnwGOkP5+EmwRDdP2jY3tZoNyeUwu9PIGQdi4ASq?=
 =?us-ascii?Q?JdS9aIStPJIZypr0kjgmN2D7aq5N0FHL4D6mDKSenquzTFmruC2M/1RuQDxw?=
 =?us-ascii?Q?egTK8yiaSwjHVuu9Z6BA062kAi1OgvUGXyCE6mG7t3X5LETYa4iy4S7LHMPN?=
 =?us-ascii?Q?HAUK/Y2s3b0jJ1+97fSMG6jX4AvRlmACK4+wLvO2?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ceaf386c-4f9c-470b-77c5-08db82a15b1e
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2023 06:29:33.5349
 (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: Y5NcnwOAROXxsGgfWP7c8ZMdEfBO9GZLdSde2mFESBB4FfmqOuHO1nB3ZMqvu+fX+B8pmhobdL3Ly6RRzcRPAg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB3963
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,
        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/tty/serial/sifive.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/sifive.c b/drivers/tty/serial/sifive.c
index 1f565a216e74..684933f5504c 100644
--- a/drivers/tty/serial/sifive.c
+++ b/drivers/tty/serial/sifive.c
@@ -917,12 +917,9 @@ static int sifive_serial_probe(struct platform_device *pdev)
 	if (irq < 0)
 		return -EPROBE_DEFER;
 
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	base = devm_ioremap_resource(&pdev->dev, mem);
-	if (IS_ERR(base)) {
-		dev_err(&pdev->dev, "could not acquire device memory\n");
+	base = devm_platform_get_and_ioremap_resource(pdev, 0, &mem);
+	if (IS_ERR(base))
 		return PTR_ERR(base);
-	}
 
 	clk = devm_clk_get_enabled(&pdev->dev, NULL);
 	if (IS_ERR(clk)) {
-- 
2.39.0