From patchwork Fri Aug 30 06:32:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 13784351 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 79E05CA0EE5 for ; Fri, 30 Aug 2024 06:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Q12M+okrYUqpGWhuD4Ow8JEWL4QdzLDMc9or5dGgjIg=; b=BMaztDDJdygXkDoTGq2478kjm4 tGrpKH9NR7/ETXcJWNiQpD8TyC5kY7WfgG1jn4qE1SUA6c4VahJjc0kgKAvhkDcXCsptSU8OVDJ8L GgJ/boVutiwzXeOToNtb6Hubaxpedl5EnRF9Lmg7cy1PPBV5MPMlYoG8E+dd8Nyu4SmRXTccfcrAj 6dkJ3Ii47N1sUg4wuk7yHm9MA3CYM7GW8Z5Rmh/A3PXREsCA6hk5JmXosb48+RZOi/YI0zwALXsiV Qrg4dwG1v4//oDpgshvcdjtaKNK1+n4Uyw2err3kCkg8c5r4mTNSXRQAERnnAfmcW/FXVg+a2d8N/ x7sKEvxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjv71-00000004wpG-0KdH; Fri, 30 Aug 2024 06:27:59 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjv3z-00000004w4T-0KpF for linux-arm-kernel@bombadil.infradead.org; Fri, 30 Aug 2024 06:24:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=Q12M+okrYUqpGWhuD4Ow8JEWL4QdzLDMc9or5dGgjIg=; b=HhMiUilCC3pXbe7ErVr6CV0V1q JR6ZZHwZS7ih7yDL96tIGCTv6eBA45hj2EA1Nyg0xyRVJki367JivRhwdSmOILoRigXBFQRSbAjNA UdachgEz/eXwt+OJl6KuDxH0G+P+hDcJBNO3oSci6K4FNE3lIi+nqfl+yoS9NE/Pjd+Buy0FP0d5S YuwXts6ONlaAVTrwFER2iTZhqJwukz8j8Z+qSvduVxpveDQcND+G9xj/Nt4mdC/iqUbYXL9lSFDDl sgb4E/0CRcZeEDoXqsF9IDN/BJmfmHe5NJAq08OWYlMPnLmVlrrq/HKquyRnOQYURQgNB4PznaEaA lKZnbBeQ==; Received: from szxga05-in.huawei.com ([45.249.212.191]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjv3n-0000000Ba8r-2djA for linux-arm-kernel@lists.infradead.org; Fri, 30 Aug 2024 06:24:46 +0000 Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Ww7Qd1Hfrz1j7PT; Fri, 30 Aug 2024 14:24:09 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 9EA3F140136; Fri, 30 Aug 2024 14:24:22 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 30 Aug 2024 14:24:22 +0800 From: Jinjie Ruan To: , , , , , CC: Subject: [PATCH -next v2 4/4] soc: ti: knav_qmss_queue: Simplify with dev_err_probe() Date: Fri, 30 Aug 2024 14:32:28 +0800 Message-ID: <20240830063228.3519385-5-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240830063228.3519385-1-ruanjinjie@huawei.com> References: <20240830063228.3519385-1-ruanjinjie@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemh500013.china.huawei.com (7.202.181.146) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240830_072440_821454_707B9187 X-CRM114-Status: GOOD ( 10.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use the dev_err_probe() helper to simplify error handling during probe. Signed-off-by: Jinjie Ruan --- v2: - Split into 2 patches. - Rebased the newest next. - Update the commit message. --- drivers/soc/ti/knav_qmss_queue.c | 33 +++++++++++--------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c index 02983f8ba1b6..d583a86028af 100644 --- a/drivers/soc/ti/knav_qmss_queue.c +++ b/drivers/soc/ti/knav_qmss_queue.c @@ -1091,10 +1091,8 @@ static int knav_queue_setup_regions(struct knav_device *kdev, for_each_child_of_node_scoped(regions, child) { region = devm_kzalloc(dev, sizeof(*region), GFP_KERNEL); - if (!region) { - dev_err(dev, "out of memory allocating region\n"); - return -ENOMEM; - } + if (!region) + return dev_err_probe(dev, -ENOMEM, "out of memory allocating region\n"); region->name = knav_queue_find_name(child); of_property_read_u32(child, "id", ®ion->id); @@ -1407,10 +1405,8 @@ static int knav_queue_init_qmgrs(struct knav_device *kdev, for_each_child_of_node_scoped(qmgrs, child) { qmgr = devm_kzalloc(dev, sizeof(*qmgr), GFP_KERNEL); - if (!qmgr) { - dev_err(dev, "out of memory allocating qmgr\n"); - return -ENOMEM; - } + if (!qmgr) + return dev_err_probe(dev, -ENOMEM, "out of memory allocating qmgr\n"); ret = of_property_read_u32_array(child, "managed-queues", temp, 2); @@ -1505,10 +1501,8 @@ static int knav_queue_init_pdsps(struct knav_device *kdev, for_each_child_of_node_scoped(pdsps, child) { pdsp = devm_kzalloc(dev, sizeof(*pdsp), GFP_KERNEL); - if (!pdsp) { - dev_err(dev, "out of memory allocating pdsp\n"); - return -ENOMEM; - } + if (!pdsp) + return dev_err_probe(dev, -ENOMEM, "out of memory allocating pdsp\n"); pdsp->name = knav_queue_find_name(child); pdsp->iram = knav_queue_map_reg(kdev, child, @@ -1784,16 +1778,12 @@ static int knav_queue_probe(struct platform_device *pdev) u32 temp[2]; int ret; - if (!node) { - dev_err(dev, "device tree info unavailable\n"); - return -ENODEV; - } + if (!node) + return dev_err_probe(dev, -ENODEV, "device tree info unavailable\n"); kdev = devm_kzalloc(dev, sizeof(struct knav_device), GFP_KERNEL); - if (!kdev) { - dev_err(dev, "memory allocation failed\n"); - return -ENOMEM; - } + if (!kdev) + return dev_err_probe(dev, -ENOMEM, "memory allocation failed\n"); if (device_get_match_data(dev)) kdev->version = QMSS_66AK2G; @@ -1810,8 +1800,7 @@ static int knav_queue_probe(struct platform_device *pdev) ret = pm_runtime_resume_and_get(&pdev->dev); if (ret < 0) { pm_runtime_disable(&pdev->dev); - dev_err(dev, "Failed to enable QMSS\n"); - return ret; + return dev_err_probe(dev, ret, "Failed to enable QMSS\n"); } if (of_property_read_u32_array(node, "queue-range", temp, 2)) {