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 6/8] pata: ixp4xx: Use devm_platform_get_and_ioremap_resource()
Date:   Thu,  6 Jul 2023 20:42:36 +0800
Message-Id: <20230706124239.23366-6-frank.li@vivo.com>
In-Reply-To: <20230706124239.23366-1-frank.li@vivo.com>
References: <20230706124239.23366-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?0oEYGQ9ENyIzrdlzF9rEm5ViO8mAB+d8D0xm0FKp4lLACtzMvjnMLUuI1Epy?=
 =?us-ascii?Q?L9rZW/CmWiYMnyo7EjcGQiJeXSsoQEbdopxee7uCNGuVrdiE2HiT+23xuJRD?=
 =?us-ascii?Q?N5Q4q1DsJr/BKFwCuG3+MMSgskC7DuM1AtikDbiB4y8r/sRkhHlNt5Za5Otb?=
 =?us-ascii?Q?Z111BV46BInGk7sTJaS/E3JqDmYoUYXTgushzTu/gePgmEm04xWM5JHnPgPd?=
 =?us-ascii?Q?aS8jnNN9ZRd9UBFUnGMiX6FPMG7xscmy7vsAB9eOW6uojH9z46LV43s5Vwd9?=
 =?us-ascii?Q?99sSxBP+Pfyy7iAEK+soTDt9FxnKxTzclO7nxuTHjCxaG33zOXAeuQ/elut3?=
 =?us-ascii?Q?tWjj7pOF2VaARoQn9uLpK/RONvmXvd0U7nQmR2+cAbXIhDXJ5EYGy+Azlfrl?=
 =?us-ascii?Q?5qRtNS7pFpYxhc8cyl9V1z1Wv8dvpEa7e5n6SP0OX/XdXVYGXApED/uYyiLR?=
 =?us-ascii?Q?U87p0+EmM+vC8jlHfa4oPaF7FHbQI4qGH3zfiYX+yj9y0gpNRU68KGHkXU/B?=
 =?us-ascii?Q?ip5NImwpD386eYIHYr0WWyfP1ETniIjPisGpDBaUzq9PPPISULOD97pgw1C7?=
 =?us-ascii?Q?JbOQjcqZhmvtZHOd+5zNyyPFX/Xeleer2pAx4O9EXU6psawGpXqqCyRcxkeS?=
 =?us-ascii?Q?/DkW8J3Uoe3eJWO2yie6nN6cb+nhdpWxQybilOp/Nk2hX1XEGSfCgrMjFQLs?=
 =?us-ascii?Q?s5E/1zNGNVH5ArV6HvOKmB9bt/EXcR+UDwtbR0f7OGwkZJByvkCsQxQvexfQ?=
 =?us-ascii?Q?dbVvL06dAfkv5dXE9TKocQAE+fWc6J4eHrPRxmX9a/77rgZyOyqQDPS93Muf?=
 =?us-ascii?Q?zKlJ9+0mrrndiQ5jEM8dqxjRVI4c2s73eFU4LTqSUuy6a5+5HqM597mc9vlz?=
 =?us-ascii?Q?5qR3SrkZ6lN6TXkmFXNpReBpR0MwuuPiD23RD15Ob2qf2OBeAU9obU20YoTu?=
 =?us-ascii?Q?ELLVVIUkGijt9WiG3OXgUwwyMvadn3ympa1LI6CKG31k0OuEUyBXRThXTBvc?=
 =?us-ascii?Q?rnFl4iB6MJV3XAbsObXZZK0npKanz/Hl2HR3cTmuiP8NtZ8U/JiLq9h5u3Nk?=
 =?us-ascii?Q?KoVbWYLB44wEKc4/w+5h1qMt1Mu6KQESKLHYkYJS/pjYwh0h0IBYlEeBmsQB?=
 =?us-ascii?Q?t1ONwlsLBwb3UexBlpMgPqfCtdmfM8qOaKg47XA0NJidB+MKilztcwfGsGX9?=
 =?us-ascii?Q?8qp0rK4CSpWk0xLe0EOwY7raE2woyQnh2guIhslZMEw76GVGfnMMEoC5ltQx?=
 =?us-ascii?Q?2xJnRWKC+HLUVRfQy6oWfrIJWVMP8Slk+dEn7wdFYxROxdAmDOVCHqBjMexL?=
 =?us-ascii?Q?72UkUA9z5ndN5OrRJmTqJzOCZ3p0Bbj5UJQ0wGfYZ8tCfVhdyiGtJ+I0bMdG?=
 =?us-ascii?Q?2v9pj24fbWRbr2gCYjXhqWmdIvBh9sln3tZHku2ZoRtLckn/fsWh34VJlTk/?=
 =?us-ascii?Q?LLmpNYJ/cmsE+NxQkYepeQsB67qK0zGBfcceAiDK8MDvzn3QeJXEtQLT2CKt?=
 =?us-ascii?Q?5+JdTonzxHBIn1x1DqJ/h8SvFHHNoYqV5hmXyTb5dLrRCcqs2NTyBRFVDgfY?=
 =?us-ascii?Q?W1U4NRsIaWKAQPYlr1bPN1IpPgOKNfQ7Su5f3Ont?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c864341a-bc86-4c39-8f88-08db7e1e877e
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 12:42:59.1725
 (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: LMLVqKGSpfSNVohca0TcAzdWaA4xTeEvfX8ET+ZdrQNTaHngk4cOTsish1to6/kJw0eGU1jr+LBFXbNDi6z02A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR06MB5602
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 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 | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index b1daa4d3fcd9..246bb4f8f1f7 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,18 +265,18 @@ 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)
-		irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
-	else if (irq < 0)
+	if (irq < 0)
 		return irq;
-	else
-		return -EINVAL;
+	irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
 
 	/* Just one port to set up */
 	ixp4xx_setup_port(ixpp->host->ports[0], ixpp, cmd->start, ctl->start);
-- 
2.39.0