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:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 7/8] nvmem: qfprom: do some cleanup
Date:   Thu,  6 Jul 2023 12:05:03 +0800
Message-Id: <20230706040504.34057-7-frank.li@vivo.com>
In-Reply-To: <20230706040504.34057-1-frank.li@vivo.com>
References: <20230706040504.34057-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?qEdDsI2/pcG079lezUXnkniUz86Y91gO29vFnjHXg6TXiImqtrsrRzGw8sVx?=
 =?us-ascii?Q?Edj7nSl0fEvhwTH7GYvQFaQbhLT3bThlPOCF09GqZ3Zqcxcb+Yrn5kXVSpKl?=
 =?us-ascii?Q?2OmB2f2in16GeemSTUFKh79hYKRvN/MWVbA+SwIKcqMU5aqLoQoW1wHrVmcu?=
 =?us-ascii?Q?IRwf2MnDjw/9IwhCwHl28RLneJbrqfeu1zCRwf2g0lW+cjdyRv9UtdHjJ4IO?=
 =?us-ascii?Q?PubeTZRam5eIXVSEB3pEAfkXUEv83B8touz+qrU/jICPZdH+r8EMJP5/UxTU?=
 =?us-ascii?Q?586n191bxqsnGfaZES54bieJT0bncyFlPSIcMk1ZZhdY4u+oHIfHH4Ve7tgd?=
 =?us-ascii?Q?Jmy9MEitkJhae8pGzIQjhPOj6kdSd6gfuX9r5kEWVGPmDj3gm/21dfjhm9ez?=
 =?us-ascii?Q?h8DN+ahjZF88t9CvY+jmvDKwo/p87Y+8dR0Qru8bzL9lPblIPoSh1wrNGKfL?=
 =?us-ascii?Q?BCRPm5g9112GXWXkKv3ElT921Ho6TGVfk07aeXG9ZLKs669Ymgpwgbh25IX/?=
 =?us-ascii?Q?4d9bPjVu+KkA/Vyi2pZ93ZO4B2fRN+YQCbCsakQqw345NcfrdTYa0POT3dB5?=
 =?us-ascii?Q?VV1FfIMmyof14hmN8l4SQFgZCeO8zO5W+rVxrqFBLCdS1m/98XAxUX0rh3DU?=
 =?us-ascii?Q?nOHPwoq2DIMHPDDKWqknXimkMNa5Vhxn2h9pOY/hU8kcieOMoAqDbNoFCzyf?=
 =?us-ascii?Q?8yHT5GzTB0z+8PxLpVBlv03OAVeUjD4pe5GfQA5jE2ovPi0UMsqihRXQeomY?=
 =?us-ascii?Q?+R0JazPUNygaNmDRWLTy07PbuycquZgryIsberV+dQSYmNNYkZHfxZLs/xNo?=
 =?us-ascii?Q?7ki1vgd141J3PZ8PtbV2E9Za9AkCpRbPz8B0kMAFlbK7/jk87inWRuemwyaG?=
 =?us-ascii?Q?59kiLhrLNyFvvrdWdxRibjXIIk7Uq0nvCEVYl9/hCIwaU83yrnLocIpDN+Vt?=
 =?us-ascii?Q?qnS8oMr91KJZf+8WP/wX+YSA8bNjSsbYnWBOKInIzZwKBPh5rW/MiJXBwXV8?=
 =?us-ascii?Q?HOm5pnZDk9/Wbdem1r8+06zwATsiY/rLXwnAa/Ia6gmilL4UVjcsIzmwVvBw?=
 =?us-ascii?Q?buNLOvnxABeHasUfOKJuNHCdAkwzNp6I5Hvh30xIRXq8/VLvWXen7/UxiPZG?=
 =?us-ascii?Q?ZisIu5gEW6bOsrAR5nWHRmK/NUILQG2q+v45nWjr/YveYSMmNtRuiIvmGCJh?=
 =?us-ascii?Q?p0dGvPHNt8If0ezcaOH4oskmX0tjI+7cjQuWFR9/gvQx6hcqINaiODiqhM2N?=
 =?us-ascii?Q?vHjsRCSKN/tBroAuxk+L6iW7JXq/DPj6+oGTX9rRlsMKV8qqhoGA0nmZx2cB?=
 =?us-ascii?Q?2+b/Wo1PaJoJDaGPC/98xeWSas/llpMKiVy+hyA0K/fRGFGcNvqH6B9vkRFM?=
 =?us-ascii?Q?u0FC/m13YUCFAI/VoQLiIXNFQWXoZmkz+niuyVL6OKMdEc22uz9cwzTvOSjO?=
 =?us-ascii?Q?V6vULJbxxyG4bu5+PLCHBBqdHmV+90dXbw51qEIRCDHbgXTqnKuoBCNoils4?=
 =?us-ascii?Q?sj6rv3WKnn9OMlWaxCRzLp9OT4DiBXSwPHp5239x5gVDYZgd43k8Zey2KVGx?=
 =?us-ascii?Q?lTpxLL1ybDzf1LH5tYpEPNuVVtHU0MqNhzeB4DsA?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: accba1a6-f2fe-47e4-0505-08db7dd63a64
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 04:05:26.0556
 (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: TPOlkKj1nBDWwnHdPTMvVfGEpUi2d5kWhrELvNmtKiRobYqTH20MF1VDoFGAT1NohV01crCeIHW/bDqT2N0yDw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR06MB4548
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

Use devm_platform_ioremap_resource() and
devm_platform_get_and_ioremap_resource() to simplify code.
BTW convert to use dev_err_probe() instead of open it.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/nvmem/qfprom.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c
index c1e893c8a247..14814cba2dd6 100644
--- a/drivers/nvmem/qfprom.c
+++ b/drivers/nvmem/qfprom.c
@@ -374,8 +374,7 @@ static int qfprom_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	/* The corrected section is always provided */
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	priv->qfpcorrected = devm_ioremap_resource(dev, res);
+	priv->qfpcorrected = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
 	if (IS_ERR(priv->qfpcorrected))
 		return PTR_ERR(priv->qfpcorrected);
 
@@ -402,12 +401,10 @@ static int qfprom_probe(struct platform_device *pdev)
 		priv->qfpraw = devm_ioremap_resource(dev, res);
 		if (IS_ERR(priv->qfpraw))
 			return PTR_ERR(priv->qfpraw);
-		res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-		priv->qfpconf = devm_ioremap_resource(dev, res);
+		priv->qfpconf = devm_platform_ioremap_resource(pdev, 2);
 		if (IS_ERR(priv->qfpconf))
 			return PTR_ERR(priv->qfpconf);
-		res = platform_get_resource(pdev, IORESOURCE_MEM, 3);
-		priv->qfpsecurity = devm_ioremap_resource(dev, res);
+		priv->qfpsecurity = devm_platform_ioremap_resource(pdev, 3);
 		if (IS_ERR(priv->qfpsecurity))
 			return PTR_ERR(priv->qfpsecurity);
 
@@ -427,12 +424,8 @@ static int qfprom_probe(struct platform_device *pdev)
 			return PTR_ERR(priv->vcc);
 
 		priv->secclk = devm_clk_get(dev, "core");
-		if (IS_ERR(priv->secclk)) {
-			ret = PTR_ERR(priv->secclk);
-			if (ret != -EPROBE_DEFER)
-				dev_err(dev, "Error getting clock: %d\n", ret);
-			return ret;
-		}
+		if (IS_ERR(priv->secclk))
+			return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
 
 		/* Only enable writing if we have SoC data. */
 		if (priv->soc_data)
-- 
2.39.0