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:     Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
        Robin Murphy <robin.murphy@arm.com>
Cc:     Yangtao Li <frank.li@vivo.com>, iommu@lists.linux.dev,
        linux-kernel@vger.kernel.org
Subject: [PATCH 2/6] iommu/omap: do some cleanup
Date:   Wed,  5 Jul 2023 21:04:12 +0800
Message-Id: <20230705130416.46710-2-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?Iu/Og58sb0R43FBDsNniJpnpZ+6SiH1ZJlyuwTfYegHBbIMJrWqoze0R6id9?=
 =?us-ascii?Q?9qadxayroQyx9N9CevLV0duj3nuAIvW12/OHs5VhEuNZ4wNtme6bFrcHpEFM?=
 =?us-ascii?Q?BLppfqXt2uwjWlhlPKFOlC0OajW5N05ySF3ExKHVwKLyjmWkuEov821Lmjne?=
 =?us-ascii?Q?oG9Ob/MGThGmdcizr/E2mOFduhK5nT20+BCb1VXnH+JR/M7uF4aM2kaHibFA?=
 =?us-ascii?Q?5YmzbTcHmXeAXOq7XEpVRSbcn+Va9MXSX4i/JiANGXXQHLJECFy7dmPeuf1h?=
 =?us-ascii?Q?23cZF4I4fDbF7SiZGOUb3HOj/xjJ2Z1v2zkvm148yYoqLEPtIxhF9G6KuqqL?=
 =?us-ascii?Q?wt/W1kojfCxcMABrH/cXYYc1WMlHcwYGt1QiGrZhmru3rRmLDF5guAIHuYAg?=
 =?us-ascii?Q?Kh3EOEglP3tXeFdg3/D3CCF9tv+DPdkt5JqITl4V0TxfMeO9VU1V+nZpu9nv?=
 =?us-ascii?Q?7kLNbDwd0wmaI2vXL4g6jBijjaL16iE3pvIM7tsomjpbxtiB1X71TPZjePB0?=
 =?us-ascii?Q?T1+BJgTSgkEEInG+Ru6Jv52t8SQTaei1eN88lrK5oGC898vglOhP/P4KOpAC?=
 =?us-ascii?Q?dc/vCeq+f0lNiCX1yHjVtGuh/B3TLdaGDwAhOPDUsEUO55pUwPx0wR7jGtl3?=
 =?us-ascii?Q?WIPP3+ugZOZ9tUwsS9KueBfAPt+ZV/3LZJtSY7wDXUSoZnq908nNnKDul1xB?=
 =?us-ascii?Q?Xl33poBtA1Ya2xQu+c6s6DYCDpvX7pwtjf9uN14lDOuqlKnkQrn4Uy8/cyj2?=
 =?us-ascii?Q?/VGvWUiHP2oxkv2i3ijsLt3GJQck6Y4+iCwl9nnkcPieDSVDRpjJ3GKYn22c?=
 =?us-ascii?Q?9qjuS9uyci8jMh9ncOPxtPOin/n6HrpldoU/5CbPb4Dc/igyvCT/H1JQyujq?=
 =?us-ascii?Q?aNDUFFoCPNrpxmcrZ9bYt5drzZyZKuG+AsQtaT0BwL3V/efc0ksawe95vP9y?=
 =?us-ascii?Q?FT9yOimVSg2eNdqK6xBwBKl9+Nq89hMP9FRt6yZlq/3dKJcIGlF8hOHdFGU+?=
 =?us-ascii?Q?vEzAjSaeJmRYue3T2qKenmx/VCuweJvTfMbFV1/M4Ej845sRKTL6f9BmndzA?=
 =?us-ascii?Q?vI6u7TkO/hyeqw39NzFY223tW/mDwkFPTT8pXaKOG7NiGNk3Ro3poj23mfSP?=
 =?us-ascii?Q?Fgnqlwx22X32nRDQRTXRO2h5OdsKUuWFbDIrzOIwNW+aKilxUeZDMtc/6nh1?=
 =?us-ascii?Q?wfFgVI1DT+rsd1Ql3zAA1UDlywxUH4WSgRM79JnmrP75l0RT2JiQkNlbJz/y?=
 =?us-ascii?Q?7PZELlVYjjtjyfS6X1EhrO3+sm4bSy3meHhDY9nTxYbjCM9eY1aLjdySQ+D5?=
 =?us-ascii?Q?Zb5WiqdaPEslllf0khwHXSmuveSqwKyzV6jP1HBS9WvtjnhLk7/mWfnP/Wdf?=
 =?us-ascii?Q?lwPLMLQTceJKhKBw49q3F/enPxcWt1/U+vulg8dNZWmzs2zWqzlQ8BKWW5Kq?=
 =?us-ascii?Q?1FMu5ywPXqY8Z1zRRO8OdU6WcGzitGkFikb+5VrDNqyje918J4FkU+QyZT4D?=
 =?us-ascii?Q?P8mjjI2Hq8Rt7lzbVEmX8Pt+ejarQQGGq0US+zrEWJ3DyS+CZbY+GxRilxSS?=
 =?us-ascii?Q?+RsHbLEDEIwyqYk4qQM5yn63sWF0LYcN000YTkXq?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 07ec7b15-a600-4fcd-73d2-08db7d585dc5
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:28.9076
 (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: IU/o1nQzrSun1bSAdPEjhgK0pj6nXF+icnvUTTZEmWH5TcInJWsXMODaZlWRZILneOdTmlNaHGwLL+RdsmajWg==
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 use devm_platform_ioremap_resource() and fix return value
when platform_get_irq fails.

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

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 537e402f9bba..ed4a29478473 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1163,7 +1163,6 @@ static int omap_iommu_probe(struct platform_device *pdev)
 	int err = -ENODEV;
 	int irq;
 	struct omap_iommu *obj;
-	struct resource *res;
 	struct device_node *of = pdev->dev.of_node;
 
 	if (!of) {
@@ -1205,8 +1204,7 @@ static int omap_iommu_probe(struct platform_device *pdev)
 	spin_lock_init(&obj->iommu_lock);
 	spin_lock_init(&obj->page_table_lock);
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	obj->regbase = devm_ioremap_resource(obj->dev, res);
+	obj->regbase = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(obj->regbase))
 		return PTR_ERR(obj->regbase);
 
@@ -1216,7 +1214,7 @@ static int omap_iommu_probe(struct platform_device *pdev)
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
-		return -ENODEV;
+		return irq;
 
 	err = devm_request_irq(obj->dev, irq, iommu_fault_handler, IRQF_SHARED,
 			       dev_name(obj->dev), obj);
-- 
2.39.0