From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FA6A42A7AF for ; Fri, 17 Jul 2026 14:46:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784299588; cv=none; b=J73H4LxBzKiVu+WConajHcXVWFxcA4YFHQJv0x8m5Eu5hQfWNlQQxR4EH8JCbN67MNLEvDm+8hqPueHJ2Y+fMSozxjfWf5IXx3IDROBpQuPwiAhKnU30OhnnBEbRB2H8etNvBLybBGUB/X3JpVqO01HhSKL/H9OX9AnljW5A1rY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784299588; c=relaxed/simple; bh=SHMrIaS6yHyhN7hIfNsSI2APEMkhBUx3UNbQJXjB6Ts=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bslFpWv4CZCtsGawMvH2TujGhuRZMZ+jUbXpPIOwh7D3w9h1lLDcc6PO0ssog2m96WwLMN/j139RILxr8Nj56UlvFsdj12GpP6WXGpGLm0bNpjjPb4NwssBEXkbPFBW7xfCjLFtU7vl0SuKE/ucslPmphAAdcxbUImbvFwl6cWA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=XLhoDabl; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ewju07kD; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="XLhoDabl"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ewju07kD" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66HE7rHb1973903 for ; Fri, 17 Jul 2026 14:46:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=IJVHSO1u6a/ Hfz7sqtNZdF678kjFyDUjw1u5+bJ5TaM=; b=XLhoDablxd/mhdo8ez1693QDxIF 71qWgd0edCXFj0Rz1v8wKBbgAhCquMMXNm+QLqj5/FAlDufws9TACRMTd12vW2cF ylTN3CiwKhIUtZ8OMTz0I0UgauYIh/7GwEXI99vvk4/Ub81O/SFbonTsaq2dyzuI HFLJUEffr16K9D4irXhtqDpnZQY6SZTPpKZ5mehuhNsxFjMCFNYxz35TcQUT3Qjw veTT7Ikt6A1FvwSjmkTcC54cAy7oDD/kScH5rEL8td6Kni+fD4ZNFNfXAIzlZRpd HbBh7lSYfARwPIaOu+Y1gUSdTjL3q/JUpukcqVVyjzBkptdPkSzttD+fW8A== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ff2f2vpx5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 17 Jul 2026 14:46:26 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51c21c01cf3so98152511cf.2 for ; Fri, 17 Jul 2026 07:46:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784299586; x=1784904386; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=IJVHSO1u6a/Hfz7sqtNZdF678kjFyDUjw1u5+bJ5TaM=; b=ewju07kDNwPZ6Hiw2ytfRxGksTrupM3In9rsUzG9qbUQHeqjXUtj7n+P0kfwidPSf+ w8ztXT4J+1Z5QfztGyMRlp5pzrT7pDCpGbwGt9SnZ612F9zTjeLAJ/Klf4aYlOjtJZZb VZYBS8/jTbXked7tzLrdtDo4SHY5Sk8vJxI0//G+nKoEHJRG1wEH6JaPC0z3EnKTG/JV hPMhL8C1KYKQT1TOWPlbvK7YZSDWCvwwqIz8fSlY6e//cacO8lzESPq0V4xx3EP5/xIR hp4UdoU3gK95WF3dVBQLw3MYnIz8kn01MOkam+tUQXI86Y4p3J1vZVuslUnlNY2Aud9g TV8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784299586; x=1784904386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=IJVHSO1u6a/Hfz7sqtNZdF678kjFyDUjw1u5+bJ5TaM=; b=a7Uw1qtP5u9hMRTQLMWhMkgxYxzY46XZGxeJICR6T1X3r/NMK9bTnNuI9jZ6fW7I8D Ulo5X1E2IW9o5g+Vy7VffawCzcmj8wOGTDZaIKNtCFUMhaSks04TmGtgHrSH/CshKlJs RhxBBHSgs3/kmu+v+BxpVOplqJSbVkC+BdGCfFzK9F+7sW+LqlVRo+/p+RMxk6E4VzBS tH1wTPDlfOJUiMy620AaYre5dkL3XkixtNgyj7OD2/bQBzwCMlIpGWfQ2J52Zxm6ML2p H+17+ZM/Gn4GpJOXziDTSoPN4AeS7fbAFB5EMNeFCNUDPKGIWOhBb1Fzd0PHFS76sQAe ZTeA== X-Forwarded-Encrypted: i=1; AHgh+RrB/HtPEC7pxT/96YzoprvCR5qd0BNXDp8snABdr5JbYEmltHllTIQ/Y+zr5svKvn4AJEeyfvUClojFbcY=@vger.kernel.org X-Gm-Message-State: AOJu0YyrYwB2Ny7AhT9RQLviOBiJZtp5IkxR1/CpnrdPjE9OCqoEUda0 ygjhMe0QJ5FSbEQWZUXdr1RR3yWBE45POP/TllSk1LHFpui8IpPVJX/zGmUWZSJriiIxeJcGdp2 sPqnVhT2mPBRprLhLYm/SwH/Lp2C0yqFY1YQTsA6YsK85iJ8icSmzfZs/bN1VByrGfhI= X-Gm-Gg: AfdE7clCSyMkzvCtol4g8JF/EgIsPwkhEj/XbrYfysoMFHsGCepJdNbFDF7OTfS2Wgu Q8ty0/ZjvK9jkhuFsZmWoYgt5yEL2b5qWhY8KSw5pmrwk6iFsQRQBqbof/wc8DBDDVQNFMR9h96 6YVQ8Ohc8VcpPtZ5esXyBavvnb1acD5jqf2p6DGWaf2nfu8mb9wsbt6hTNI4rCP1vZhAM2ETBxb 5lq6i94Rf9TcR5LvtG/jLCpyq8NwOsXDPhx4zqyx4MGFtH82rTHAw2gbHUoDNvYWDyI7BoOTk8Y ZRy5t+B8YRQ9QSAvG2a6OpsVPQOjOrSdpR5hV6V1YAjaTSFINI/x1e7MxCmaHv8pCQjFTwPCiTK fo7zrpbvu7gm0tio7Pg6e5b2SOqI= X-Received: by 2002:ac8:5913:0:b0:517:6631:101b with SMTP id d75a77b69052e-5213f66b7admr24607091cf.55.1784299585618; Fri, 17 Jul 2026 07:46:25 -0700 (PDT) X-Received: by 2002:ac8:5913:0:b0:517:6631:101b with SMTP id d75a77b69052e-5213f66b7admr24606711cf.55.1784299585126; Fri, 17 Jul 2026 07:46:25 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-52149a3ce4fsm13414801cf.0.2026.07.17.07.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 07:46:24 -0700 (PDT) From: Mukesh Ojha To: Rob Clark , Will Deacon , "Joerg Roedel (AMD)" , Alex Williamson Cc: Robin Murphy , iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mukesh Ojha Subject: [PATCH v2 2/6] iommu/qcom: Use devm_pm_runtime_enable() in qcom_iommu_device_probe() Date: Fri, 17 Jul 2026 20:16:04 +0530 Message-ID: <20260717144608.3216274-3-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260717144608.3216274-1-mukesh.ojha@oss.qualcomm.com> References: <20260717144608.3216274-1-mukesh.ojha@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: QznamZMI9_8e_rr9iiOOe4I4bWQ6Imm6 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE3MDE1MCBTYWx0ZWRfXynXNQwXKiMeP XrW6jFa1nFsVJWsSgniYWwdiop4oFM5/8wKoO6PDTr9YAtzvb2tgkph3v/Rq0TPfBfIrF41doSN 3tkHcXZhcHFAy2dYBpJkHtzCl5+gkEc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE3MDE1MCBTYWx0ZWRfX7nNLYc+AC/iN E6gP296y9clQb1qo54NvGkkTr+xJ2EeAQS4GILSkZBWHoXmeZLiRIDNSyTyYZjuLsSNLIMj/GSD HAZZO9zcimkyq2VsnaBhVeM9trsauCa2BvyHxWsCqmoWAGZYD/uerZKM2Zu4g6UluoxQrU5UQdW QORo/S9K7rlngZy8wVGwuljnhc7TjOpXLcqU9nvzd+U8y7P7aRI+wla0/EFuxmFSeIkfor1kSyE fUw8LIk2wXy8t2O9iWWeQX5LBGLi5B1dOqH8TCiDzy57srwfBSzCasuePSeXVmrNKTg68wN+Ms7 IEORNuksMQx0UL6RqQuIsz4IOowc/adCPtVnmtBZ8amFeB3RQUugNBJAEuP2RTUQL58BSFP0oLc 3Dq6M8ursIOlCvOD4az6WszlSkUUWf8el/QVxwyZbl5bConKzptg/5eN3GU2yTm8gZebdkj9E/y 4wnLl7eiOwIOZWt0Z7Q== X-Authority-Analysis: v=2.4 cv=NcTWEWD4 c=1 sm=1 tr=0 ts=6a5a4042 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=ZhKRi010OgpVv_9PQ1gA:9 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-GUID: QznamZMI9_8e_rr9iiOOe4I4bWQ6Imm6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-17_04,2026-07-17_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 phishscore=0 bulkscore=0 spamscore=0 adultscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607170150 Switch from pm_runtime_enable() to devm_pm_runtime_enable() so that the matching pm_runtime_disable() is handled automatically via devres, both on probe failure and on device removal. This removes the err_pm_disable error label from the probe function and the explicit pm_runtime_disable() call from qcom_iommu_device_remove(). Signed-off-by: Mukesh Ojha --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index 09f2ee6be988..71251aecc292 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -836,20 +836,22 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) platform_set_drvdata(pdev, qcom_iommu); - pm_runtime_enable(dev); + ret = devm_pm_runtime_enable(dev); + if (ret) + return ret; /* register context bank devices, which are child nodes: */ ret = devm_of_platform_populate(dev); if (ret) { dev_err(dev, "Failed to populate iommu contexts\n"); - goto err_pm_disable; + return ret; } ret = iommu_device_sysfs_add(&qcom_iommu->iommu, dev, NULL, dev_name(dev)); if (ret) { dev_err(dev, "Failed to register iommu in sysfs\n"); - goto err_pm_disable; + return ret; } ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev); @@ -868,8 +870,6 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) err_sysfs_remove: iommu_device_sysfs_remove(&qcom_iommu->iommu); -err_pm_disable: - pm_runtime_disable(dev); return ret; } -- 2.53.0