From patchwork Wed Jul 5 13:04:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 699701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58978EB64DA for ; Wed, 5 Jul 2023 13:04:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231313AbjGENEf (ORCPT ); Wed, 5 Jul 2023 09:04:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230100AbjGENEe (ORCPT ); Wed, 5 Jul 2023 09:04:34 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2102.outbound.protection.outlook.com [40.107.215.102]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F197E3; Wed, 5 Jul 2023 06:04:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ng65VQxeHtYjR+cDaSX9KHUYHuvun34DBqOwgXQU7Lt6eIN8bq8ip/AkhaoMYfnMIUQHjzdEvtKcEYKI9IAMn6cCiBxfXJ2TG/iNis8zJ5Jgg1Ainxf+hiReAbLhZiUJU52rucYEJydES416s+j51W/q+4BNRznp+8nX+ZR1UvS3ZBCKqPVEr4MdwD9ML+1RWhtcwpwRLD/9H7qvezXSzkLcOAiQp9HYtcTP+7MopbxMvYiwr4F52zjPuXSZCCAl7h7DpX/1OcFi8N5vgT19QJp054Bq9oFbg3w9/QwkXTPl0XLtk6FYHMa4+6Xp6GyWUpLZcUKxXHutVwJVvsH7aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pnZrRpWJHfvggV9oAys2Y2gnnknH2ZnzOeA1IXV7vWg=; b=oZcmZUe0bNXSI/qaIaSECmnIw+1yGJ8iuS9SBXwBnqISlJXSxcx592EisE0s4oM917XXjcRilNdpAlilh2l+PPP24fIpO4MXmUPjInvJfbrh7xuPjYiEMaW0L40ocbVxQhyZJ5rEDbdhyr3//oCmYDrAJaaYiOkdQ1c31TLxybd3Uh1I6hP/8UGIzjT7wearEA3zjAfXrNUTkQF0QaFxY64ZleIM3Qawo00DX2D3MyYKjoHIn7Zw4acr55imejDHOtycbaxGADv24+hGtIutCdDGaSZZ+3nofnpe4/r7KXMF3Zsbjl/kpJGuNh4Kt8uEZYjl6Y2+dtQM0xNz0i4Rlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pnZrRpWJHfvggV9oAys2Y2gnnknH2ZnzOeA1IXV7vWg=; b=lkuByXzIUjiDk8p1zQn3N9Oe+TuuzCboow58qEeLlqoyQesGT5v1WBbV15s5jGNhh3vkvq4S0FYDa63j4v8SX6+/dMaElaVJoCsrmvc5Uh5HHVCdNHvHZ1QFgjtPNMDHNu0dN/L3b34DC3llEGDFBaq+du0t+vvGO1o7Sq0EJ9JrLfHl2BDfYjwzDtycmAjwo9NGVUXhLWacLnEtiwiY/2+c49rvERe4iUA+glSn2V+Pk1GwQ/450cFnP9/XuH2ohkruMevanMxIipfiPzqBRCcd7bPRsJ/ZmUDnJHIBiX/8dZEUALR2Dq1WOclREF9jakUV3fmSv/dmJ0r4ttGQ1Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by SEYPR06MB5891.apcprd06.prod.outlook.com (2603:1096:101:d4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.17; Wed, 5 Jul 2023 13:04:28 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c%5]) with mapi id 15.20.6565.016; Wed, 5 Jul 2023 13:04:27 +0000 From: Yangtao Li To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel Cc: Yangtao Li , iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] iommu/arm-smmu: do some cleanup Date: Wed, 5 Jul 2023 21:04:11 +0800 Message-Id: <20230705130416.46710-1-frank.li@vivo.com> X-Mailer: git-send-email 2.39.0 X-ClientProxiedBy: SI1PR02CA0057.apcprd02.prod.outlook.com (2603:1096:4:1f5::10) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SEYPR06MB5891:EE_ X-MS-Office365-Filtering-Correlation-Id: 05494a64-9f56-4433-052d-08db7d585ca5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: McY1nBu9v1+QdlZc9nLlEK5JlKXs8ldPk+iprhqABp4nPrZlxmY+EaQnE9xOGYKsNjZsGLEIJfY1wG9UiQda4aABUVnyX8dNGCY04meuraykgVcbsE+ci02N3w6hM8VqoUa3gQAmT6UBmAdGF2PULI2/bkPmq3rXSYb9hwqTt+GmKZ2D0zwBpBDurYwu886kwpSLlxlz6p3RCh3uhnHOSJa701yRSRzT9qCkswNAc2xLD/m4ZxySR3g/VhBp4eBbE1+DxDFn17ygHi4YTqNDSNN0hy0p90P6NTTFTUn4f9fb+B4V0sa9QbKnvrR9lg94N+mfPnh/vy4StDYCqqOZm2ycPPFjD8KDQo94AdUn2E3uxe1FZPDrz1VJtQ4gtXDPgiLwJoLZVjuN/oiyEAOK2u079WEbJFdl48/JwYbLQg7rwv4+yxG7aOzrcL7o/pyK8pgvPfRKWTf6HMCPdkGXMWtUnsTpaA8QJh0U8Z3vnixQKLKhdtfmcTbb757vsaj779iYVWrkd+Jer+GKKMAWbMfRScxDEdze9YkqbUGa4VqlCQg0f2N4u68/0gt1S/hesobzcP4t3wppzlnxA4MuA02O2h5H9+5hZl8v9G9RPR4LAhfGfdZbxKVZa1HYd2p3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SEZPR06MB5269.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(366004)(346002)(136003)(39860400002)(376002)(451199021)(478600001)(52116002)(6486002)(6666004)(110136005)(66946007)(186003)(6506007)(1076003)(26005)(6512007)(66556008)(2906002)(41300700001)(4326008)(66476007)(316002)(5660300002)(8936002)(8676002)(38100700002)(38350700002)(86362001)(36756003)(83380400001)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z19KsaawN9vhDVn/lRMe8cJUhv+MSh/xFLl+f9pllhSleeJsRwJcD59LANXm67IqJ1o5a6l5ydt7U3dLd9tag4EIzmUjAOEmCu4iTjN+weyakB8EQ7kTqxijW65nl1x6L4l/52FXvMKPqG5R0J+hdqKQM5BFQoZdX2yfk8g54ajyt8Qqg2B/IMWoDjziZJ8pwGnR4gift5sOvc2UevXyz9X6fdi1lJwT8zQ0ZR9+b87qhgZG34YGxNSGq/+z1R6u3+H/9NhAdiSTMXmvLktQq9it9YRZGmKAk2bPsmHyeOOu4uhSyTc2U0jF4P/nFUOoQCmUQj32rYkOd21bXprBrSTe/yefZ7KortSbTKqQe6KhLNVxN3wEGfaVDhD1+VtvJRVLuHpee8WYH5t8kzgkShoOO1xOK1aRuLEDqhzjJCc8tYcZqeTWfMo/K4v2hdFWuUVot+KiYi9t2cEU/j/0KO1iYhl4PMxLMoP6bqQbN6uCTRTAaXLm7Uu0m7t7KxQQhIWIoPmI0Qe9ZJB8+9n42uWOVuZQDW9vo0VNwi0tZhkDPVCuxiPtwCybOaK451IrwTuos0ZV5f5tMNW+hY3lFECZb84smLd/H2vTPQLNBQFZ5ExB8iBJKhpACYRO43NWKj35kZ0i4f7kreVL1B+ipwrvH3PXgNJR2AR9I40xqGe+d1MFo+lmJvOBI+Yoo0q7FV01VKVgn5miHlI181g9QEUUl1K9ntqPEKx62G4zCBEF+2jfMJd6oSvDFSDDOBrCJsABzYStG1yBSGWpdJ6OcYYypgre+ed/6B1GAvOLy/Msj2Lcnp3HTcXwRqnT9w1nH8SkoCxTBlJPdf+Sy3rG+9a0mMVoiNAU16PNhXiX6KFEgQCiA5EJjbil2xVB7nOG9cKcSt5UjHGCmicOtwzgufQO6aOmRGtXYjbHlUWuK/41Div5LZNY9LZBGmujO3USxPxKTwO/lKsIs58ul2rwFlFsgvrwEv8jvQrbn9ISQMRyyb/f0mmKMUXkfov18686he/JmR7Ly3+c8ROtsUNWSXMm5qU4yMRiSOfubYr30xqHFAl0aIVFsvkAVR5g8vef4Ztzqo7JqlzRR6QVhctE2HsuUz8BkT5OsC6B3RwwdUiG/YVGEbEXjtnVv8NQBtD+gF+McP6KuM5zUpM435fNYkN1vKMkqou0a4LiDiWO4nPRRyskvkVSOPrjJP5AVNs0QXcff7BYgE4PsWrcBkgE46s0jUQqPqipD+R4WdSYtpMtZke9JJGci7Wye/FEsNDuv62ypMxIByEGBF2fzwH2XbNinmXd6MJrmZqUiPm+2fUcZTD1zjKV02r81DwiplPbMKVUD6LcfIIM7LztR781ochi6paqP0MoorwpyXS5rWjENsqFRNQfPWUuu+4ydvrUvWsGtexBTkIzwT98JRbHGBkznVjcl+NO+N7CQo2pfdPOt+m0ZarpDEM6UZdynBs5g+4oLOvz2hBy73OcXBw2C74Ycf+ghRcpcQXr1jrtFN7+PiM1i8LHqW33XKZES5Zy8MaX/q/9dX8/FT2C/LQIDj5g7GaRq4KgIu/th+i8pFmxUAQ5lgL2OxsFx4dBxRW7 X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05494a64-9f56-4433-052d-08db7d585ca5 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:27.0452 (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: zUf906VZk7sgv5PSHktWpSpavkwiHXL3T/p5TEKZIBRvCUj2PPgRXAQ+B6V3xOK2MjtVne9hcrm2xNkA2Klp3w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5891 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Convert to use devm_platform_ioremap_resource() and fix return value when platform_get_irq fails. Signed-off-by: Yangtao Li --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index a503ed758ec3..abf798104830 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -633,7 +633,6 @@ static int qcom_iommu_ctx_probe(struct platform_device *pdev) struct qcom_iommu_ctx *ctx; struct device *dev = &pdev->dev; struct qcom_iommu_dev *qcom_iommu = dev_get_drvdata(dev->parent); - struct resource *res; int ret, irq; ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); @@ -643,14 +642,13 @@ static int qcom_iommu_ctx_probe(struct platform_device *pdev) ctx->dev = dev; platform_set_drvdata(pdev, ctx); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - ctx->base = devm_ioremap_resource(dev, res); + ctx->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(ctx->base)) return PTR_ERR(ctx->base); irq = platform_get_irq(pdev, 0); if (irq < 0) - return -ENODEV; + return irq; /* clear IRQs before registering fault handler, just in case the * boot-loader left us a surprise: From patchwork Wed Jul 5 13:04:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 699286 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CDB3C001DB for ; Wed, 5 Jul 2023 13:04:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232112AbjGENEh (ORCPT ); Wed, 5 Jul 2023 09:04:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231204AbjGENEh (ORCPT ); Wed, 5 Jul 2023 09:04:37 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2102.outbound.protection.outlook.com [40.107.215.102]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 031DCE3; Wed, 5 Jul 2023 06:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hsRP8ff67lywLfBG+T5ZDDY+h2CljiS+Ib0A08t8wUR/bQvsjaQhL5QZ+QIRTmcJ+Yc3XMLiYDbmB9gt8sdgbapr24CaQOnnWQvd3aoj9gIc9qRHlgBlbLCfneLZDq3pmgiNwIsUGjBoImjT1/q8rtwGxj5mu8ysA7za0wWpw3fvjJWtoVStyfA3Uo+YNmgRZXOgjSw922LNeAdy+6KUZojHoe3ukyeMI+m3ctkTst5zJL/6aXOjfDw1z8UPOcdGzFKizRoDGkxVN/Mzl3RMbIySMuXfU3R3h+P9oYAF20F3zXqVt2oDMVQi+eV0vAMkV3EAwFfZpLO3BQ9AHuCtCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v2vDKdTnYEZ2BkR7gpe8HiidFcsF9ao4hHyBZX9JBic=; b=A6ufcOMdqPrkYJ+YyJfqhGHOgyUfeVAZWIsZ624EjFcHmDJTeEeNaHPI6ejCwLEK0rutWVjE7KnGK6RcSFGvuGl2Zsw+gbEEU/nTKh9PIs7/37by4vdIwryBks4T5ZvTtSp4TVJjCneS/Y4IURuElU/ikBzWjUiRhdmjsnEn8nlMZjb9Zbp6y7Y5IwhKgwTxCxQbKzDKMwP5YedHc3nq1CjdifVqL45hw2ENwufZxpCaMpkNEyUqI9MVYWOhJuHhBujV0yItsJV9MEfc97UIs0PoJlxD4TcXJFterJ81AOsn6xKwM2G6uGWdH/OV5xwoBGBDK5W6cFYZaC8t5Jkigg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v2vDKdTnYEZ2BkR7gpe8HiidFcsF9ao4hHyBZX9JBic=; b=C4SgY0ePnzHpVPIKcLrIwFdLEIDZB4G50b2gFAW+i5s40JosCvHq/yb8nVdCo2EoF3tZTcUhN7CfaR6hNExgVsnusn8hZ042SdYqHqcqeXtm4fQX7YNfOLdOVDA+RTE7P+Dp9VEV173Zn0OmTgBWTu/G2U5wMz2KAYVx3pWNCTKMt60IplVvla2Rnevl+wqWBRDfYfLyidEaUTA2BRd6k8HRVQZKPcDRvAsobhagn2uBqCBjhhsuxhiNBzzoFxpCAsX4YuPIu58BMReTgv/DNIrofsZGBHB37FGy/DBVQdKYShC2PEtzgQFTcKGxQqqCVK1x7VJ71F5E1WP5Tbv1Ug== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by SEYPR06MB5891.apcprd06.prod.outlook.com (2603:1096:101:d4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.17; Wed, 5 Jul 2023 13:04:31 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c%5]) with mapi id 15.20.6565.016; Wed, 5 Jul 2023 13:04:31 +0000 From: Yangtao Li To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Joerg Roedel , Will Deacon , Robin Murphy Cc: Yangtao Li , 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> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230705130416.46710-1-frank.li@vivo.com> References: <20230705130416.46710-1-frank.li@vivo.com> X-ClientProxiedBy: SI1PR02CA0057.apcprd02.prod.outlook.com (2603:1096:4:1f5::10) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SEYPR06MB5891:EE_ X-MS-Office365-Filtering-Correlation-Id: 1070cd5f-4988-488a-7464-08db7d585f5f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nqOmhLZe1CiQ9ZIFG1ZlOZjtBhiot6PcGs8zqcZZXRIJK0gjfiwBtzkBJCVAD9BziHih8kOEpRqhDvKYCnoF4zEPILx+ZTPlmMVw/o6ouPUlsSzgImK4p3mv+SFWaTSucCwwSXba2lcZ83n7xzZvEFSqPmC+8v4VzPcxEA1I7CfnrOHvsL3vRT9Bvb95JifdmwgOln0ckmVuTeAlV8o6lp4whuVN6eLJ99VrELE+OzbI27P18EtKOZjSkZVWMJgW7p41FPfAek2RK1M2Rgp81fBphN84F7qeEwx6WKFw+qOec2FppvOrbYo2YV8w2nRTC3+xAK4KYC+Al5OBP9ltxJIHWrzsGmKp4IE+IyousrfpR7Zsl4fiMww5oW+yp9vcMTOOQN8zrY7hDdU2h9L22a2VD8lWZJFvhIleRhQRmeHOQij+U+adimG6ts3VUMLVzGGBuAG3PQ7cFEX3YgsGy5Nov2a+u3PCP6x0lsUneADgWv4fOVNVf3R9lAEudecOQ2b88KtQMiK6eUG5Oy4/8jZ27Iv6ozpiLZvh/Bvj0qa62knMOyzrtTOLDuYtzlWF41aDDpQzGJTXCAF/qSYegPM53Jl/a0+HVuZ2s+0+al7scKCA3I7QXDm7Kefik+wp X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SEZPR06MB5269.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(366004)(346002)(136003)(39860400002)(376002)(451199021)(478600001)(52116002)(6486002)(6666004)(110136005)(66946007)(186003)(6506007)(1076003)(26005)(6512007)(66556008)(2906002)(41300700001)(4326008)(66476007)(316002)(5660300002)(8936002)(8676002)(38100700002)(38350700002)(86362001)(36756003)(83380400001)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pIYm9A7JBM8BC/Mv+30WTXXq5+3g5Erajf/fgcvaqBAqzioWgWNKkztSHQ29FszaXf9Du76hIREw20bo3lgDctB2goGaCNYypSpn27Bn1caYvEdVUJFxKUqZv5WhvZvfDoIu41ArEgunosWmyIV9JTrq/LzP6201zJXzPByAO6LDUO2Qha2zCg2HhViqcpz8eArkf+D4XvlL9VoY8ZTRoJVG9rlmHtK8FAFWkpPILpJIQGFzm5k/T2OK8OtQI8mYW/2j1RxlSpYYlogcqjVTnFoQXpEoCpqKHhMRB8Rz/R3QyqQr4nwgM8FKJrjcl50zMYkI/kP+bfulViMvpOcjB5sKEvMhgHM4xi9Q3UE19Q8b2U3uglQoOTB6Kp4XJMKqwuOKxJvH/EXThZnaFkYTSbOyJt58EYecmJVk2l56cNx2+WNvQmCedlt4WSq9VZM5PXhuuh6TZY0QNmKFN604h5vbp7HCYCYYWe5r2I63JlO8bdeIJLtrCMjJZlaTr0p1maZYE3jBMt4KOIpcFpoJwpQbTfOMCFIlomS1GLXkXehim/perDcinPvjah7XoKU75MQhtUCX29a5zzzSpBfhJ5qQnq2QXjRn/jpgAt3Ay4cVTlV4dkqzLhbBbEIpbouAbFoedg0hMK9ROPfl6olONnwMf+QMK0T9qYc5sAZNDrG4cMiisaCkDhpT9nHDv4c570Xif82se4+cg5VAsvwxOcomy6kEFBjBj9SDRTsHXu8K/++Yy8LChEMvPY3Erhk77YKHEmpy/gi5x1MqNNu6DZi+JZfqw/XOmIeZ3CJpxF0p3XUJrTuBeQPY/yAFuMUZRQJ8TX7eeHp8oU2Vv0hov5cL6njvoO3bPqQ7iR6cD11w8qYT3t9DvZToa/YnbOlUfimaHZd5WUuXxdsNwPoaV4fYzQh0ePgZJYfLln6mGB/wHDdjgW+COHkWM8RrhtLyxxK1uijZmeGagZQpEJlbLihGLqYoh/QIxNKwMemrnIixlKglP18IrIzkXQ3mcTGuPF42SjaGtUxi/Jl8EUAOWgccAp83EBcYsBtHNT807oLbdchBM7dIgjzfQkGa92jbMBUnaefJdgKldEqyDZUoeecbsXvp5ZnqP+MC3Gr7Ay8BNzkZBn5Bg6KOr187eUxLDdEvq8BiS2lF993RdcLv2hD1ygepQ0mnjRKa7vBi/zx2TSThutSSiRbJW9O0nczU+lulYO/m5d9nreNdDN2p6keIcFj2ROHTFDT7nEeu7MRyH/XwOPPsRN+LkrwOOrHY83QH/4i7ID1cgDGo3LnEH7RB1EzHdpTEt5jCyu9cUc2QYfBHof5vpuMdE7SCminY8Of3tzey/zYcoIkaApxpKHXhUzaRktUZUjdL4fPSR9miLguRE4DfxEK1RsqgKs8EV85b30xF4ZRgBP+MSEmZ2HJX8BdqZblw99Mzo0GzeFukGOKt8f7/0outtif4y7MCYkasQRWgAZZvsJgOPllL3E1FX17f6g1dRo+O8bhVTJzizAa8SF9KMJ63tknmP1IPOsOjiPcFN24ixm/xb56n6LqfgSGzZ2bzFrFsNKfqHIs7fgrE+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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 --- 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; }