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:     Sergey Shtylyov <s.shtylyov@omp.ru>,
        Damien Le Moal <dlemoal@kernel.org>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-ide@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2 08/11] ata: pata_ixp4xx: Use devm_platform_get_and_ioremap_resource()
Date:   Fri,  7 Jul 2023 17:55:10 +0800
Message-Id: <20230707095513.64224-8-frank.li@vivo.com>
In-Reply-To: <20230707095513.64224-1-frank.li@vivo.com>
References: <20230707095513.64224-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?3z+Jn7UMwh2ckxLy5P0r5aapjaLzvvJdFgGDRnNTaZisuXCrxIZt59+OT8lZ?=
 =?us-ascii?Q?BZp+9cRdCcWnHAqlPOlMT9iTFLJKT4m8x2OPAcDlkbwwRvi7sgMbKp+zaaDp?=
 =?us-ascii?Q?pr9rWBzLxmxzkxeYQJgle0YgEJRDKfZMnWgKInK6Auu61XMozR8RleZ50eSZ?=
 =?us-ascii?Q?C2+DrJC05qnWnqHiCLAIUSnWxpyijv+dIJ+VAy7jbZo7DDcq6s8I5TGRDqZP?=
 =?us-ascii?Q?ruK9kbZJKBceRxUh1dqkU8qivTwGskON+UsZQIH0Zp+aRtpOK7DLOrFRLxW4?=
 =?us-ascii?Q?NvB+nAdodh1567etmVlqCqwXIDmGbiCi8qxoECs/qUE+DcWHMrnL8dP2FP4a?=
 =?us-ascii?Q?K8pEBWqmEN/0rv7VPoREJ4q3WF32YR/OMnmJQOeMZC8krTQtDvBML5KUeX94?=
 =?us-ascii?Q?XHwrqTRbNJjXsV9zG9Z6EhoBOk78IEwJBZBx/pTKeMtY+wsKVdu+CoTKZ3yN?=
 =?us-ascii?Q?OFni4qCTAJ4C8P9ySxtk6t7+m1D5rK7dbydCB1KYSKzIvD0KOSUwrRuHPsue?=
 =?us-ascii?Q?AJU5qUIL/OAQ8DIflDlndmtBnXoFc2DKl/tupvbueDs00CihlW5QNygJ6tRf?=
 =?us-ascii?Q?ofO9k3e2H9W58XAglNcQRKkeHvJebEGW5sK2jiSde41pVfImmNOG0b7ulbej?=
 =?us-ascii?Q?8cypDYlfCSQkcKly9ySgJtXVRU+9/68qNuQ5+zzOWrRp3v3QdKYY6PqLywbU?=
 =?us-ascii?Q?/OMEdFBSjWFfLT6Fpd83Cs11BkLIaLA+qVv6GQuHgIwJRuxzjrIvRHCAiLBe?=
 =?us-ascii?Q?v7rAFeo7YIN01aAHhwVpgnp+EWPIjeV64GEkaWtAyj1rhFbGYriKZXuIfOUj?=
 =?us-ascii?Q?rMopGiuiPml0VzHNqGZfQtkVay5BVQx4lX+zMYsOejhT7i5GZ5ufIE6BlKKL?=
 =?us-ascii?Q?QMtR6DEgdwJrkMIypQunIZ5la8dcssZf9usJEdX3pHDsfTiyK7nGQKefawM9?=
 =?us-ascii?Q?7HmPse8XZdjK7bc6dNSIQxPgw3fJSw0Uyfj2est4J+FBMukzT61UFUcLDoca?=
 =?us-ascii?Q?3eE1wJPt6QCd/lOH31yg5sbdsFS6akT1Nn4Uy2h9XMeD/szMB7blmsMpXJoJ?=
 =?us-ascii?Q?5TP/5TYjiPOY3gcbvdOmlBxQCXom/px0n6+a4N7qMevBH8aGqRPOciJ1DFrq?=
 =?us-ascii?Q?4kMK9e/g1GCpBQ89YyScH37qo3c8gb/yeHhLNx3cIXzjYL0huwBHWrRhPjOz?=
 =?us-ascii?Q?19E5QjW2nMWMUTaqivb4Ez+fzz6mKETq/NllbzFj4b2BfZPoXCBy9xGqv1PA?=
 =?us-ascii?Q?a54rzLHBZ5mueyf+BVyx7Ibvm2OzDQDCcGb5Fv5RCk7Z4/SzMnX6gEeLMVRc?=
 =?us-ascii?Q?2aFyOpiWtXyotAZ1YjteDhwwqy6KAqYYg/4aGG0wgPYKzffaxWcqifiElU+o?=
 =?us-ascii?Q?QxlB/mEb35XzWdJvyykBvJdZdryy4EeiO3c5WjcX1eXxQmpTAeGF5DkrtpTT?=
 =?us-ascii?Q?r51B5BojhtqTIFxpx8t9xhkG/vruwok88i/QSxbv69fhSeV42qbv5++Ki0HX?=
 =?us-ascii?Q?ZXyqIXOpbWD+Pj/4OaDJIIr6msPYjZGEL8aDm488dG5Un1k6ZNYca4HYHQf7?=
 =?us-ascii?Q?/XUoTCV4FttngTUHfiTDzClexrsd4EqbdXHwYrDF?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 021d4d43-fac0-4b19-e768-08db7ed051c3
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2023 09:55:39.4485
 (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: 1/VIw+l+pCyIcpV0mHp8iU9ybRfGiY6JcRObhNUPdljxbQ5iW9GdkB27F65XAqDMjWj1oGHTRwm/exkxLkmIwA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYSPR06MB6793
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_NONE,
        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/ata/pata_ixp4xx_cf.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index b1daa4d3fcd9..1b9f67e16864 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -242,12 +242,6 @@ static int ixp4xx_pata_probe(struct platform_device *pdev)
 	int ret;
 	int irq;
 
-	cmd = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	ctl = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-
-	if (!cmd || !ctl)
-		return -EINVAL;
-
 	ixpp = devm_kzalloc(dev, sizeof(*ixpp), GFP_KERNEL);
 	if (!ixpp)
 		return -ENOMEM;
@@ -271,10 +265,13 @@ static int ixp4xx_pata_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	ixpp->cmd = devm_ioremap_resource(dev, cmd);
-	ixpp->ctl = devm_ioremap_resource(dev, ctl);
-	if (IS_ERR(ixpp->cmd) || IS_ERR(ixpp->ctl))
-		return -ENOMEM;
+	ixpp->cmd = devm_platform_get_and_ioremap_resource(pdev, 0, &cmd);
+	if (IS_ERR(ixpp->cmd))
+		return PTR_ERR(ixpp->cmd);
+
+	ixpp->ctl = devm_platform_get_and_ioremap_resource(pdev, 1, &ctl);
+	if (IS_ERR(ixpp->ctl))
+		return PTR_ERR(ixpp->ctl);
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq > 0)
-- 
2.39.0