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:     Andy Gross <agross@kernel.org>,
        Bjorn Andersson <andersson@kernel.org>,
        Konrad Dybcio <konrad.dybcio@linaro.org>,
        Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
        Robin Murphy <robin.murphy@arm.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-arm-msm@vger.kernel.org,
        iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 3/6] iommu/msm: do some cleanup
Date:   Wed,  5 Jul 2023 21:04:13 +0800
Message-Id: <20230705130416.46710-3-frank.li@vivo.com>
In-Reply-To: <20230705130416.46710-1-frank.li@vivo.com>
References: <20230705130416.46710-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?pIYm9A7JBM8BC/Mv+30WTXXq5+3g5Erajf/fgcvaqBAqzioWgWNKkztSHQ29?=
 =?us-ascii?Q?FszaXf9Du76hIREw20bo3lgDctB2goGaCNYypSpn27Bn1caYvEdVUJFxKUqZ?=
 =?us-ascii?Q?v5WhvZvfDoIu41ArEgunosWmyIV9JTrq/LzP6201zJXzPByAO6LDUO2Qha2z?=
 =?us-ascii?Q?Cg2HhViqcpz8eArkf+D4XvlL9VoY8ZTRoJVG9rlmHtK8FAFWkpPILpJIQGFz?=
 =?us-ascii?Q?m5k/T2OK8OtQI8mYW/2j1RxlSpYYlogcqjVTnFoQXpEoCpqKHhMRB8Rz/R3Q?=
 =?us-ascii?Q?yqQr4nwgM8FKJrjcl50zMYkI/kP+bfulViMvpOcjB5sKEvMhgHM4xi9Q3UE1?=
 =?us-ascii?Q?9Q8b2U3uglQoOTB6Kp4XJMKqwuOKxJvH/EXThZnaFkYTSbOyJt58EYecmJVk?=
 =?us-ascii?Q?2l56cNx2+WNvQmCedlt4WSq9VZM5PXhuuh6TZY0QNmKFN604h5vbp7HCYCYY?=
 =?us-ascii?Q?We5r2I63JlO8bdeIJLtrCMjJZlaTr0p1maZYE3jBMt4KOIpcFpoJwpQbTfOM?=
 =?us-ascii?Q?CFIlomS1GLXkXehim/perDcinPvjah7XoKU75MQhtUCX29a5zzzSpBfhJ5qQ?=
 =?us-ascii?Q?nq2QXjRn/jpgAt3Ay4cVTlV4dkqzLhbBbEIpbouAbFoedg0hMK9ROPfl6olO?=
 =?us-ascii?Q?NnwMf+QMK0T9qYc5sAZNDrG4cMiisaCkDhpT9nHDv4c570Xif82se4+cg5VA?=
 =?us-ascii?Q?svwxOcomy6kEFBjBj9SDRTsHXu8K/++Yy8LChEMvPY3Erhk77YKHEmpy/gi5?=
 =?us-ascii?Q?x1MqNNu6DZi+JZfqw/XOmIeZ3CJpxF0p3XUJrTuBeQPY/yAFuMUZRQJ8TX7e?=
 =?us-ascii?Q?eHp8oU2Vv0hov5cL6njvoO3bPqQ7iR6cD11w8qYT3t9DvZToa/YnbOlUfima?=
 =?us-ascii?Q?HZd5WUuXxdsNwPoaV4fYzQh0ePgZJYfLln6mGB/wHDdjgW+COHkWM8RrhtLy?=
 =?us-ascii?Q?xxK1uijZmeGagZQpEJlbLihGLqYoh/QIxNKwMemrnIixlKglP18IrIzkXQ3m?=
 =?us-ascii?Q?cTGuPF42SjaGtUxi/Jl8EUAOWgccAp83EBcYsBtHNT807oLbdchBM7dIgjzf?=
 =?us-ascii?Q?QkGa92jbMBUnaefJdgKldEqyDZUoeecbsXvp5ZnqP+MC3Gr7Ay8BNzkZBn5B?=
 =?us-ascii?Q?g6KOr187eUxLDdEvq8BiS2lF993RdcLv2hD1ygepQ0mnjRKa7vBi/zx2TSTh?=
 =?us-ascii?Q?utSSiRbJW9O0nczU+lulYO/m5d9nreNdDN2p6keIcFj2ROHTFDT7nEeu7MRy?=
 =?us-ascii?Q?H/XwOPPsRN+LkrwOOrHY83QH/4i7ID1cgDGo3LnEH7RB1EzHdpTEt5jCyu9c?=
 =?us-ascii?Q?Uc2QYfBHof5vpuMdE7SCminY8Of3tzey/zYcoIkaApxpKHXhUzaRktUZUjdL?=
 =?us-ascii?Q?4fPSR9miLguRE4DfxEK1RsqgKs8EV85b30xF4ZRgBP+MSEmZ2HJX8BdqZblw?=
 =?us-ascii?Q?99Mzo0GzeFukGOKt8f7/0outtif4y7MCYkasQRWgAZZvsJgOPllL3E1FX17f?=
 =?us-ascii?Q?6g1dRo+O8bhVTJzizAa8SF9KMJ63tknmP1IPOsOjiPcFN24ixm/xb56n6Lqf?=
 =?us-ascii?Q?gSGzZ2bzFrFsNKfqHIs7fgrE+7lnFcHAea9cdSEu?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1070cd5f-4988-488a-7464-08db7d585f5f
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2023 13:04:31.5840
 (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: jvuy1nYgDe9VEGZ7Z5FfJaDK7LBZh283gZxMoG8eSYbkhz1RCHvg8P7dm1UIutw9TB9ULIbNSYH13B7N9OUejw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5891
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 to devm_platform_get_and_ioremap_resource(), remove redundant msg
and fix return value when platform_get_irq fails.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/iommu/msm_iommu.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 79d89bad5132..349b46b4b714 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -735,17 +735,16 @@ static int msm_iommu_probe(struct platform_device *pdev)
 		return dev_err_probe(iommu->dev, ret, "could not prepare iommu_clk\n");
 	}
 
-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	iommu->base = devm_ioremap_resource(iommu->dev, r);
+	iommu->base = devm_platform_get_and_ioremap_resource(pdev, 0, &r);
 	if (IS_ERR(iommu->base)) {
-		ret = dev_err_probe(iommu->dev, PTR_ERR(iommu->base), "could not get iommu base\n");
+		ret = PTR_ERR(iommu->base);
 		goto fail;
 	}
 	ioaddr = r->start;
 
 	iommu->irq = platform_get_irq(pdev, 0);
 	if (iommu->irq < 0) {
-		ret = -ENODEV;
+		ret = iommu->irq;
 		goto fail;
 	}
 
-- 
2.39.0