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:     Mark Brown <broonie@kernel.org>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-spi@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 3/7] spi: ep93xx: Use devm_platform_get_and_ioremap_resource()
Date:   Thu,  6 Jul 2023 11:27:22 +0800
Message-Id: <20230706032727.9180-3-frank.li@vivo.com>
In-Reply-To: <20230706032727.9180-1-frank.li@vivo.com>
References: <20230706032727.9180-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?FXQt0U4/5HKv2KjNLv3N9icNx1vf30oZrvdfwaXgiG4h2mORu0dcsJLDtvfQ?=
 =?us-ascii?Q?+yv1D4Uo5nIgYTHfInswsvsO1B46uZfTiQE0knns0EanLq3Lhxq1RjFntAAp?=
 =?us-ascii?Q?BNxLY2zE1z5FfzW9qYcgYrQrFkZE9oQ3SRED6jlRcHpZ+LdXq4EljHNPhI5e?=
 =?us-ascii?Q?xLqnHC12Wm3jKq5dsONqLM00EpeTvHa1uiZSt8it2avTykNIgoL+Agmg8DV8?=
 =?us-ascii?Q?x80sNN6RW2WfvEzTNxSU7vLd/+K/dfMzS3YQDSFOj5Rwe+FMUgceqJv4C1j8?=
 =?us-ascii?Q?0EpA/TT4Q5PzSgGmZXIEdengU/Oo3GmvM42+MGLP5dZD5Dotsu6jtiRoyWHe?=
 =?us-ascii?Q?Z2YG3jdWa8ZvsdQPLj1SWaAw/2L5qRBX+IXyd6DKe+v2XhkPhfg8UDkfbCnD?=
 =?us-ascii?Q?MAAA6MHUd37eUFdWiNoMPW1YSwNJmAVtAoxr+ggpVJHrbGahnY042DezubaO?=
 =?us-ascii?Q?WnZ1bZ5A6ZGCEfpLs6br1kcQLrZYOO1sb79FqhuVinGGuvV4bmFvLl5ZTUGw?=
 =?us-ascii?Q?9NwKC2P4lUsKWmZSl3Bc940Q5G0y9eLTQYR+j9oESFdPPtr3jnZaFjeBwiOM?=
 =?us-ascii?Q?N7233zoqCzMp7LBXDO4RLRudc/yJDhvYiaB6aZrYQc7b4yoPaxqNNybcFFTf?=
 =?us-ascii?Q?2Jdsh0bijQDxc9KX0/ADdQ1DHDbKeI8kgM2jlbMk8MkcWwl7I8e+Rsne1Zzu?=
 =?us-ascii?Q?x/1lPZ0uuhT6Ao+EKixlCNdbVeAD7kW3CygrM0tb7eLNRZWWrX8/HTvlInMt?=
 =?us-ascii?Q?aU7qjRYiFwL7yUX6jhQVuXLA0MpWr8F0BrnCix66CYixukFyZBJhDUMbRfa7?=
 =?us-ascii?Q?MFG3V9xezzySwosCwWhOoW1B947KEgRqj+z+Nvo3RkgMQYmxRJABV58jYRl7?=
 =?us-ascii?Q?5RkdTfqhR65mpkUSkTNv5Bg3BduuavNtSfYsXX8QTmOgM6yGdUPsBehJob6+?=
 =?us-ascii?Q?/maigNtWl5PZsyNF44yxoDGAn9p0929uSWBoxWBbjXwHaxTxhriBwYPK5hr0?=
 =?us-ascii?Q?jdoU0h6rn+vdQSZgDJGgI71MwM+5QoFxHHwTvj9coSvC7loM1zLOv1HjwSsL?=
 =?us-ascii?Q?bZU+UcLBtzdjkk6KxzfPhwMGK46+Z2hxXu05UWMMUn0tGjzR84IVhLPcjb9u?=
 =?us-ascii?Q?t9o1iUN6NL4D0iFH+Yq3x86JhBZsJ0bUSHOmhjm09Q1GXAk5HX9RELKj84lb?=
 =?us-ascii?Q?8qG6wxnX/mSYJ8v5ILXw/SFkGUX3nzVr2CYp4u4itjwBI5AQUy/sFHdupE8L?=
 =?us-ascii?Q?33MgVqj6cFIQZU9TAq9PK3sYAicsJ9EbxuVk+2fcsrh3HtP5/cqMY33kcXfn?=
 =?us-ascii?Q?NbxZkf1tjPHfI5KgijyxDGyqNhIha9R7aRZhzN6HxLQ/JDFrR5xkFS8dtOqd?=
 =?us-ascii?Q?6F79MrPRlioidEN6ktSENlyBCuuEatrUlvOJMdHH5nPr2cBfxIt7zmpnIJaA?=
 =?us-ascii?Q?p9FCdl/1ULYQnPROjZGGDJ9Gctx9gfB63A0yjy7I+UdLVmwobM71V6vEO8Zh?=
 =?us-ascii?Q?UqoFdWrz5oCHbePUKwJwQt2CpbZGaURdrbfLre/7f/crebHyAmSvYAFf8yOb?=
 =?us-ascii?Q?UvljJK4SAQW4dVumU+IYx/2zMbBQmgy4khn00y4r?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ae5e0a72-85cb-4d1a-c718-08db7dd0f3fe
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 03:27:40.4788
 (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: llBM/2anIc0zivl/W6MTdsjWdwHr/XhR3d+3z+jdIE0wPs14z4bS9xhXf/tNWRzPWLxhJxhsN93QIlNO5bPang==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5468
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
        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/spi/spi-ep93xx.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index 1615fd22f9a2..3693b3d425c7 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -661,13 +661,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
-		return -EBUSY;
-
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(&pdev->dev, "unable to get iomem resource\n");
-		return -ENODEV;
-	}
+		return irq;
 
 	master = spi_alloc_master(&pdev->dev, sizeof(*espi));
 	if (!master)
@@ -705,13 +699,12 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
 	master->max_speed_hz = clk_get_rate(espi->clk) / 2;
 	master->min_speed_hz = clk_get_rate(espi->clk) / (254 * 256);
 
-	espi->sspdr_phys = res->start + SSPDR;
-
-	espi->mmio = devm_ioremap_resource(&pdev->dev, res);
+	espi->mmio = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
 	if (IS_ERR(espi->mmio)) {
 		error = PTR_ERR(espi->mmio);
 		goto fail_release_master;
 	}
+	espi->sspdr_phys = res->start + SSPDR;
 
 	error = devm_request_irq(&pdev->dev, irq, ep93xx_spi_interrupt,
 				0, "ep93xx-spi", master);
-- 
2.39.0