From patchwork Fri Jan 17 14:18:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 858449 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 056B542AA6 for ; Fri, 17 Jan 2025 14:19:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123546; cv=none; b=T+vFTK4uyzDwi/bW2JMvVWKEfefZgag/6pLuhKAQVpv0yDrleEasjZAVZBM52MorAuhT9Gdx/2zjTTHcSe05XwQDmveGsEMiNaHPZPrMNP6VkXfJKCWYOZ+x4Zy1sEPwD80nYCsBeuW5lsi38M5rJq5W3zOsK6aPl0l57ZwZ0ks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123546; c=relaxed/simple; bh=yG8sQ+nx9Eqw58/wd8HyjrYz0XP+TABX6QtHMArWsyc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l0jyFbP73khyvfmkd0+EZB/OOERSXI1UB6866H5po7wUyYTmsJMeshlloO6n5ZDtxm1Qhb+ykb4i47nPSrTDelESYG9FvwS/tuhrFE02fwStWDmEDnC5PcxJzthI/VWpdMVW9igG4ur+nVugT2ZXwq5cHgqNmgSCZCkXaHC0VHg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=MQjFAArJ; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MQjFAArJ" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-436326dcb1cso14461505e9.0 for ; Fri, 17 Jan 2025 06:19:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737123543; x=1737728343; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EJPpzjW5eAxwdMtWI5K0l8mGr8BTWJyLsOuy62grEjQ=; b=MQjFAArJ1oQ+XiFb01gGlTaIwCMUZ6/eaMswdNPVP+UdM4o40QJIZ4veg5VEDYPmQr rqAfDKhj6MqIX9tbOcrFqqSazHgM4yVeVSxd/EfGt6mXhtqPCfZM5R0DLPdP8yiFCZ17 Kx9vl30rfvYaAXHn0vcf3taVGqhhTjRjDGitTyNd/hgDt4nojy7Qh/SCf+5cOAMp8CkQ 3tt2jSRMbsKP2b05Gtt2sHxfOhBm5r+cMNjiSF2FsKE/8alqqr1SWsEgCeWPtC0ZRjmU Ya/WH5kkPKpvsK8gPA+iFvsDM4+IjtZWAjF+U61lLe7x8RdrIUZ9jMpak0Pgd0skveDP VQAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737123543; x=1737728343; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EJPpzjW5eAxwdMtWI5K0l8mGr8BTWJyLsOuy62grEjQ=; b=FG3ZPKVDmBoVUn5fTuJHI/u4gMiQ3douTF9YWqoHf6oN7KcuYjqESkxB+R18rVCJqB aEavjd+/Bt0H6BfelxkjyMDQ/NbqqeZTEz4Iz7JFNEQyslcNL/5bqASPVHNB1ovaPo6a WYBM8/0ZP6CcYG99RpJIaY+elK5pUUCaOSyZBcUvhZxKoGA6SxfQmozj2dYv12rqPIsX GKKDTkrZu86lz2KFirUzAee0Sl/CvOmrwOL7UBlknX2HmwAxeKV8iW94A+eNaLiWjuOq CqHHBg00zWQo4ZFYVew7uB+TTwqpyeRyt+NtF+kmBsUerVwMFjR50fEongEgZYZfRWS2 8Fkw== X-Forwarded-Encrypted: i=1; AJvYcCWn/f3wPY0gTS/2OrsvrDqBg6M+e/V5ZKg+DRAIDgs9J8wNdVcHmtKppMpYqARKnyY8T10z/zZ8pOQZ@vger.kernel.org X-Gm-Message-State: AOJu0YyJXopmSqD3tED30aJcVq1aEMQNw5CCvlE0u0h8WgyLHeZLTB1A bmTF+/mUQiEs3RI/hmUS8zDEfsk1DuTWLXJ5WvFehrE0wIXfQeJ2D3PkbowZiMw= X-Gm-Gg: ASbGncvFOJXZxcqcKX0rNjvGDnbNpi8DQaZcAKgD6ROomcx7qbOvU9jylcgCtLdOIuT z30Njh+vBlveVkks5O+o4V33FbkBXzllathDZEHgJMCnZKDUAxk447LZkRpMgLZlD/S9oi6kArC KB3/RZRVgCN483KyEUnE1L1VP/JOOxdv6JOUUZvNb3xO8F3jTuQ5qwzP5Ymeg6Rg6jFMMu/0mjI q2X/9ex9b+yiHYK3NesS/2F9xdrZ1O8+lzsMuPk7vTG8E4OLM7EX6kDH7UTVPIML5UCnLOyrXTo wHqlZ5oLKhOv1/LuZe2904DtDt0vxc4PuIML X-Google-Smtp-Source: AGHT+IG5K3FNsGuzWqRixT4OiMWoWe6dLCzIRKc7oOU3K/CehjLULkM8EVMs4EBMJ03fSNI8Cqn0wA== X-Received: by 2002:a5d:4e86:0:b0:38b:d824:df3 with SMTP id ffacd0b85a97d-38bf57890e3mr2043468f8f.24.1737123543332; Fri, 17 Jan 2025 06:19:03 -0800 (PST) Received: from ta2.c.googlers.com (169.178.77.34.bc.googleusercontent.com. [34.77.178.169]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74995f6sm96764195e9.1.2025.01.17.06.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 06:19:02 -0800 (PST) From: Tudor Ambarus Date: Fri, 17 Jan 2025 14:18:50 +0000 Subject: [PATCH v2 1/4] soc: qcom: ice: introduce devm_of_qcom_ice_get Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250117-qcom-ice-fix-dev-leak-v2-1-1ffa5b6884cb@linaro.org> References: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> In-Reply-To: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> To: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Abel Vesa , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Eric Biggers Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, andre.draszik@linaro.org, peter.griffin@linaro.org, willmcvicker@google.com, kernel-team@android.com, Tudor Ambarus X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737123541; l=2995; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=yG8sQ+nx9Eqw58/wd8HyjrYz0XP+TABX6QtHMArWsyc=; b=XYQFpfWRMZlFbEbuuaOCZ4aYKbikkwMh7NOh050v6RV5pq7o3U3s8DytNgIi/EzzIkR8kxinl Olkd6PT8mK+CLzSZcBzMMXEmMb1XtCif7d7l2h9XI0JbH14ZTKpkBWo X-Developer-Key: i=tudor.ambarus@linaro.org; a=ed25519; pk=uQzE0NXo3dIjeowMTOPCpIiPHEz12IA/MbyzrZVh9WI= Callers of of_qcom_ice_get() leak the device reference taken by of_find_device_by_node(). Introduce devm variant for of_qcom_ice_get(). Existing consumers need the ICE instance for the entire life of their device, thus exporting qcom_ice_put() is not required. Signed-off-by: Tudor Ambarus --- drivers/soc/qcom/ice.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ include/soc/qcom/ice.h | 2 ++ 2 files changed, 50 insertions(+) diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/ice.c index 393d2d1d275f..79e04bff3e33 100644 --- a/drivers/soc/qcom/ice.c +++ b/drivers/soc/qcom/ice.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -324,6 +325,53 @@ struct qcom_ice *of_qcom_ice_get(struct device *dev) } EXPORT_SYMBOL_GPL(of_qcom_ice_get); +static void qcom_ice_put(const struct qcom_ice *ice) +{ + struct platform_device *pdev = to_platform_device(ice->dev); + + if (!platform_get_resource_byname(pdev, IORESOURCE_MEM, "ice")) + platform_device_put(pdev); +} + +static void devm_of_qcom_ice_put(struct device *dev, void *res) +{ + qcom_ice_put(*(struct qcom_ice **)res); +} + +/** + * devm_of_qcom_ice_get() - Devres managed helper to get an ICE instance from + * a DT node. + * @dev: device pointer for the consumer device. + * + * This function will provide an ICE instance either by creating one for the + * consumer device if its DT node provides the 'ice' reg range and the 'ice' + * clock (for legacy DT style). On the other hand, if consumer provides a + * phandle via 'qcom,ice' property to an ICE DT, the ICE instance will already + * be created and so this function will return that instead. + * + * Return: ICE pointer on success, NULL if there is no ICE data provided by the + * consumer or ERR_PTR() on error. + */ +struct qcom_ice *devm_of_qcom_ice_get(struct device *dev) +{ + struct qcom_ice *ice, **dr; + + dr = devres_alloc(devm_of_qcom_ice_put, sizeof(*dr), GFP_KERNEL); + if (!dr) + return ERR_PTR(-ENOMEM); + + ice = of_qcom_ice_get(dev); + if (!IS_ERR_OR_NULL(ice)) { + *dr = ice; + devres_add(dev, dr); + } else { + devres_free(dr); + } + + return ice; +} +EXPORT_SYMBOL_GPL(devm_of_qcom_ice_get); + static int qcom_ice_probe(struct platform_device *pdev) { struct qcom_ice *engine; diff --git a/include/soc/qcom/ice.h b/include/soc/qcom/ice.h index 5870a94599a2..d5f6a228df65 100644 --- a/include/soc/qcom/ice.h +++ b/include/soc/qcom/ice.h @@ -34,4 +34,6 @@ int qcom_ice_program_key(struct qcom_ice *ice, int slot); int qcom_ice_evict_key(struct qcom_ice *ice, int slot); struct qcom_ice *of_qcom_ice_get(struct device *dev); +struct qcom_ice *devm_of_qcom_ice_get(struct device *dev); + #endif /* __QCOM_ICE_H__ */ From patchwork Fri Jan 17 14:18:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 858448 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 224018634F for ; Fri, 17 Jan 2025 14:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123548; cv=none; b=KbQbpHBnyBX4rboSE8+g1uMJ56MYeM9q80F3OIYTudvSV99n/XHT0sXYgj6qVcRVQ3xiwpGFKpiefkOkWLGkFaEqC2M4J2enb6wv8ScVdy0Vz7oDKbJw5ROFSbC4byvfQba0U7on35MCVoiBzO1Ur7mb0+OJIpU9tMtu/a+lGrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123548; c=relaxed/simple; bh=GZ2r5p0dFfNcF1ZvOqiFJYmYWFEQPwiZzMJJY9diiqM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dQ3PPEm+jCDjX5qLIjPZ4m0U795kGipN474iFevQqXw07dlFHNPOo3SnSPG72Q5li2XHXHKY3oh6ofxkT55C+4ZjmwXG9j0WEcggtns0kKxmn+h/xL+4j4mZ3C3MSGCDFHhcaT+Am7HQvpFsTA3BdS7eIvis7rVh9om4SaPL6WA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RUMtBizF; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RUMtBizF" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4361b0ec57aso20983165e9.0 for ; Fri, 17 Jan 2025 06:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737123544; x=1737728344; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=TrQMwi+hF2C0bCOO/tTN4XbolEHkOKYGtBgFZ4HZCnE=; b=RUMtBizFVYX0qVr4FBO/0JwxgbuH49a0YsV1JJd5j9CQ29Lf7Rmmk7qaTi+lF+elXQ h2+FrVeeNJIffu4ZwhyO5Hox1KLKtaQRmlU0H74LwrMt3H9KBoOod4P5kuLXi3PxhKVB Rs/flOJ8kfJnuTXkXvdXBxFc60uztwrA6eXEVSWoqJdh5c9Dma62nhHpXJ1tjA15lqj4 UXYtfWtTwgoNmNXj24As2pjtYccfOBw5nUooFpbTHpMxcBKWygyR66Ld8+au+LyH4grm lG1mm8Di+Ua108XhybY+rBWap5F3oHy5szKaUoix5k4ELR+SMTPNkh3yN8k7tL9LU+df wdfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737123544; x=1737728344; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TrQMwi+hF2C0bCOO/tTN4XbolEHkOKYGtBgFZ4HZCnE=; b=eOMINuXS4uXqqdv/h96jssdCEDaIj5T1G9XsndObUSt3WbtOc/fUqnR8qCs6x0JZDd 6QFjA2aq6jS0u+lu7eswdxoAyRVH41tvif+k3jddhGpb/KMT/a1D9Vm9g3VNnjZOKhr1 e1gK+uwIh0fWOuC1BKthFazzYGvuIigSRJRP6ZTEGjD1Xt2Nhj6VgFMZPecYuiCcceq7 6sz+Pb7ShC/Ea5p1FwLpCWMLuG+a8a5vNGB35h3OJ1h9HaONxpJkJhzcoXjj1HkwipKJ rKBVY6htVKPT1VitAuSv6ECKW93mzfV3PVnLMG2qJPb9F5r7o1pD/XJB3C+T3HLNaPKT ap/w== X-Forwarded-Encrypted: i=1; AJvYcCVg9JoEyP0GG/DgfeNUDwL5dE8zAYucHfFfJBciNp5WEurEu1aaxC2gZ/UeagHI8HZEPnFc5OgLgbSW@vger.kernel.org X-Gm-Message-State: AOJu0YzUjWWeee6u8vNbuVYR1NnlmdhN/yKzEY9u2xvFDysMyCli3Xft FQ26jcrFht/auXccSnxQOv3ocCSgUrnVkv6qPXEN7Abv9RGuiFaKce9bBAPEBi8= X-Gm-Gg: ASbGnctzFrna/jEadFGBvaCfRQKSz9QCR3apdls4zpRueVqT1ofrCben++d0wtmdn7p 1tob8n2aWOv+yfhQRGdZxZVydgEcFSR0Fx81NZoMGV4aslLiz4vVqlRb1Tg9583JRLyrRXFguZS k4EG2FzBFxUAJtjsN9Vq6/CBZUHDyLdFl1TN0bPdM/iGstgCoOvL4MSGbg42UvZE+qEPjiI92Ke Aag0MixdpuLAyZBFL34KLouYZnnCE+yZo9C5NLQwPX7ehJyehGoG98exSkd3nacypPitZcoIqgX 2460u4AO5behyXdWQvQd7M4E20XXYPHkcYsV X-Google-Smtp-Source: AGHT+IEfaWlQCEKKaatnAdlw13qgkLJVr8s+K3HBqqjRbB4QuuaaO9z/foSCuP32eVd4AGEznbyiWw== X-Received: by 2002:a05:600c:ccc:b0:436:1bbe:f686 with SMTP id 5b1f17b1804b1-4389141c073mr23873315e9.21.1737123544308; Fri, 17 Jan 2025 06:19:04 -0800 (PST) Received: from ta2.c.googlers.com (169.178.77.34.bc.googleusercontent.com. [34.77.178.169]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74995f6sm96764195e9.1.2025.01.17.06.19.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 06:19:03 -0800 (PST) From: Tudor Ambarus Date: Fri, 17 Jan 2025 14:18:51 +0000 Subject: [PATCH v2 2/4] mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250117-qcom-ice-fix-dev-leak-v2-2-1ffa5b6884cb@linaro.org> References: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> In-Reply-To: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> To: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Abel Vesa , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Eric Biggers Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, andre.draszik@linaro.org, peter.griffin@linaro.org, willmcvicker@google.com, kernel-team@android.com, Tudor Ambarus , stable@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737123541; l=1054; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=GZ2r5p0dFfNcF1ZvOqiFJYmYWFEQPwiZzMJJY9diiqM=; b=45d3iiXT7ApSj86eCeo8o+vCQk8H9LTCNmewvtv437mzQ3nPnN5PwM2jJJAI++4mdsjm8dOa+ C8c22bdPYz+B52Him4FeCPJNwliX9YaycwJvlhaqizsV5BZY8YMv59M X-Developer-Key: i=tudor.ambarus@linaro.org; a=ed25519; pk=uQzE0NXo3dIjeowMTOPCpIiPHEz12IA/MbyzrZVh9WI= The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get(). Fixes: c7eed31e235c ("mmc: sdhci-msm: Switch to the new ICE API") Cc: stable@vger.kernel.org Signed-off-by: Tudor Ambarus Reviewed-by: Krzysztof Kozlowski Acked-by: Ulf Hansson --- drivers/mmc/host/sdhci-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 4610f067faca..559ea5af27f2 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1824,7 +1824,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host, if (!(cqhci_readl(cq_host, CQHCI_CAP) & CQHCI_CAP_CS)) return 0; - ice = of_qcom_ice_get(dev); + ice = devm_of_qcom_ice_get(dev); if (ice == ERR_PTR(-EOPNOTSUPP)) { dev_warn(dev, "Disabling inline encryption support\n"); ice = NULL; From patchwork Fri Jan 17 14:18:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 858447 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA547146A69 for ; Fri, 17 Jan 2025 14:19:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123550; cv=none; b=SaUgktduGEkvxCRAMsITB8fjBlPfZLBR/mbQtSj+cT51jHH29LgoSlxmFC4ld7Qb1rvixrBZGWnHIog5BE1FiL9cczVtqgKPrT5tIDsU0qPgR7es5+E1230ErofGjos9YlwTTSLQmNBc9gQB4OMI3Ly+uTS9Db4E7oL+ijS3AVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123550; c=relaxed/simple; bh=rkN16KFyfCGbANv1URyC5pgmPDjOKr7gcHvrAmLZiGk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dUfOCT48ZNuqg5mBY1IiiKmDJ+EZ4oMHUaLmV1jC1HI9qFeKL4diCHtc101A98kq/EH2OicKZo90+1oEGh4O141OOQF+0bdwcpO1tM7E3TWxihtjmsdGDJH6cuFM34DqzgxJU7waRM/RjZoeJ9laHl+MA3z99zcmihhnLPTZPIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RFLZapW2; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RFLZapW2" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43635796b48so13816805e9.0 for ; Fri, 17 Jan 2025 06:19:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737123546; x=1737728346; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Iw3hbPMx3DDHttAVH5KXQAb7aC6TLapsYr3FJPMUjSk=; b=RFLZapW2iKxxI8T3dcu5OKvgO6KtaG5AFr2Y+YZdn+ocSk+15Efbz7fjDPCQauc/Of 5MqGBrnQdmdpO/oyYETWL4wb3lcTg1qkbriLA/qjqAM+xF3w476xErqlA/GMrEEk9pcc pRuLppqbLvw3kDNiVQ/+Fx+dxMu/uq5tuMlMWCj3ek68UzP1bRzR0wzWG7XNRp0xqocd WmCfCOxjtcKqpB+2UpVUPBuCzejZbjsUjK556UQ8BrBLiRTRCpuj0VVk2b/Jc5CeiH8z 2U9+PqEa5p7kpPDyHiWSMLJzlA+vKfKkHqmgcxtCbUQs8J80AEQyijVB6GKLnrS9+hWj dD9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737123546; x=1737728346; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Iw3hbPMx3DDHttAVH5KXQAb7aC6TLapsYr3FJPMUjSk=; b=bwQsjTYkTV0z0RuS3KcUxL2mTkjxCKul49FCEIcKiyb0D9I0Be1Oo95c5Hh17ErV4W 9RN+cX/w6/Xf+QsMQiVusR6hzoy4j2lvLLfq6D+6rCL7iB+SdMR5PLDDFQVsbEb5UTac CLg47pQBJuKX2dNT5dkfH4EzcWSLNBeaO9i2qnIyPUig6kLHXGj9ODmA+t4IEuBlUWaB N2G8g7u97xDfFXV6bPr/5REaVuaHs8wQ5nyfC25SkqlG1R+zyJe+NZvw0IkgxHXLvBvv cM7L9PwAYzyEra7D8WFtQlTm8MiROoO9YvXPn7Y1owroOlUkkqaV8itCTmUXhj/rWLS4 jpOw== X-Forwarded-Encrypted: i=1; AJvYcCWqKBqznemrT11UiLusrEDMvu3i8cjG/k/wcbHsXdpk/OzbVn5ab1jxFCVaK0YhYgYPXmfrSIHWX0zC@vger.kernel.org X-Gm-Message-State: AOJu0YxG50xz6ljLCRxu9S/+ViXPm3ZcihnAR/8y9CfwWvUO7vCm9+iy GLhYkSgZ5RqlNhfDObjS/UddaYzDv6U8iN/+aA+9/uWxG7iyEY21t+1XmNmUdWo= X-Gm-Gg: ASbGncv00Dn2/H6AIqH+ejwuOHI0IBz1VN7/rXyKcbzU9ERX//NtoNPte5xJ69oPorJ r+lusUF0h1jaqyjBJ/VCDv2RShxiFJl8KbrVDBJdemj8T5oKkjDlfAAxJOnJnmjXMPZKVBuARn5 EYs1MzkMh3yvmreuY4EnKYUP6+PCOOXa6QcxN0Jkuwyx743CEYxkWT2msyjGOEM+gNX7CSmtE1K xgzouVBP0Z6fNCcnTl50GI/C8C9YRk6CnU0lCYjTAmhPe169/kjXY+1rdNE6IUf/fyUvhPNyjsR IXU59v73mzfija7ailhPnfxtJeTL1xbtnkp1 X-Google-Smtp-Source: AGHT+IETblMrx8KIRmwK9VCr83hmCG0f17UdDxWZUvSUIiOhoWXqGDdx+je3BMGMgRQiM12epULhgw== X-Received: by 2002:a05:600c:698c:b0:434:f9ad:7222 with SMTP id 5b1f17b1804b1-438918d3bdcmr26937075e9.7.1737123545938; Fri, 17 Jan 2025 06:19:05 -0800 (PST) Received: from ta2.c.googlers.com (169.178.77.34.bc.googleusercontent.com. [34.77.178.169]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74995f6sm96764195e9.1.2025.01.17.06.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 06:19:05 -0800 (PST) From: Tudor Ambarus Date: Fri, 17 Jan 2025 14:18:53 +0000 Subject: [PATCH v2 4/4] soc: qcom: ice: make of_qcom_ice_get() static Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250117-qcom-ice-fix-dev-leak-v2-4-1ffa5b6884cb@linaro.org> References: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> In-Reply-To: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> To: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Abel Vesa , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Eric Biggers Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, andre.draszik@linaro.org, peter.griffin@linaro.org, willmcvicker@google.com, kernel-team@android.com, Tudor Ambarus , Krzysztof Kozlowski X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737123541; l=1621; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=rkN16KFyfCGbANv1URyC5pgmPDjOKr7gcHvrAmLZiGk=; b=GkVvea3pMVMpJEOFkCogbzhGJLadWWc2COyDHp4IFtQvqwN8HlMWhUl0amrJXjGiMy0W2cgM3 AqCC1xa+8FLC3UvoQfVuAwJIX32Ugg/vLxSxUTTBxQ4yk/FSRFpuR10 X-Developer-Key: i=tudor.ambarus@linaro.org; a=ed25519; pk=uQzE0NXo3dIjeowMTOPCpIiPHEz12IA/MbyzrZVh9WI= There's no consumer calling it left, make the method static. Signed-off-by: Tudor Ambarus Reviewed-by: Krzysztof Kozlowski --- drivers/soc/qcom/ice.c | 3 +-- include/soc/qcom/ice.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/ice.c index 79e04bff3e33..2310afa77b76 100644 --- a/drivers/soc/qcom/ice.c +++ b/drivers/soc/qcom/ice.c @@ -262,7 +262,7 @@ static struct qcom_ice *qcom_ice_create(struct device *dev, * Return: ICE pointer on success, NULL if there is no ICE data provided by the * consumer or ERR_PTR() on error. */ -struct qcom_ice *of_qcom_ice_get(struct device *dev) +static struct qcom_ice *of_qcom_ice_get(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct qcom_ice *ice; @@ -323,7 +323,6 @@ struct qcom_ice *of_qcom_ice_get(struct device *dev) return ice; } -EXPORT_SYMBOL_GPL(of_qcom_ice_get); static void qcom_ice_put(const struct qcom_ice *ice) { diff --git a/include/soc/qcom/ice.h b/include/soc/qcom/ice.h index d5f6a228df65..fdf1b5c21eb9 100644 --- a/include/soc/qcom/ice.h +++ b/include/soc/qcom/ice.h @@ -33,7 +33,6 @@ int qcom_ice_program_key(struct qcom_ice *ice, const u8 crypto_key[], u8 data_unit_size, int slot); int qcom_ice_evict_key(struct qcom_ice *ice, int slot); -struct qcom_ice *of_qcom_ice_get(struct device *dev); struct qcom_ice *devm_of_qcom_ice_get(struct device *dev); #endif /* __QCOM_ICE_H__ */