From nobody Thu Oct 31 00:18:03 2024 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 88492155326 for ; Mon, 5 Aug 2024 08:57:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722848265; cv=none; b=DtJiiosGcMAh83N+yY6zUHXqpvTY2fRkrzB8bxoFz6tQZnzOUH3xrTfH0O4/zp/IseWDIcOhTxLHZTkT6c8Nt0dtwh3F9gErTFvYN68+YYYmQeOV4+iDgo7j3tvd/dEcHGAn1ZiILrwW7ihfDTEy0R1rwmQlePs8bO6OJoEUzXw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722848265; c=relaxed/simple; bh=RjrXaB43FNpiPz5wCGH2K5IEQTOlqgjA/UnGaEOyoz4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=duW6VUwgqY0j0fqHnrjSsCI1lmPTQ8VuvrhhhaejgEEb+mmCGxdsEQbWWleXhhpauj11gAxh8L5Poyw+lwGQtwYzUkx1IQH3tz2LirspEElgADWs57zT0ZRbz9U4NAgJ6ng7sV9b0sPex/PDAcMkIoSXQber/sJsI0sPmVDAMLI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=aBx/P/U8; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="aBx/P/U8" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42819654737so63714895e9.1 for ; Mon, 05 Aug 2024 01:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1722848261; x=1723453061; 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=PfVnePU1U4lqoUTEVw7bELLkGGkHu7U5a1JhcdSjQFY=; b=aBx/P/U8vVUGqNcsHmx5vhkLq86xpLwSOl91+8IBW4csBwUlzoQPfEz6M7EwN6G5hk undpSKlpyVUe0fTKl2qzINlu64+qT5tjVG5IzCblboYpcUmH0lBNLLqzyVZ4v61cCJvh KWMbQ1k/IPapHN3P2DCzlyLtmnbhyVrZLd+KeYPbllbiSoQUfj0dmOhH2Nm927K+8xV6 h+TjzM65emZuWLv8gbcoqyyXCTpRJ+ka/TCUxNiBMAooq6re5Lei8hm4ElklXq7gUape GXqoLQ8l7Zh/F37CUNbi/Q/2aUZG/xgYTwZ2GTuqdXDC5OIvTd7qd1Hzfgjsxxkt4EIJ KknQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722848261; x=1723453061; 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=PfVnePU1U4lqoUTEVw7bELLkGGkHu7U5a1JhcdSjQFY=; b=r7xsBT+3tGuFpW/CrcKZm3SgKNe9lTl0JQvBM8Nl9qGKx5wOuIgmlgBmyJNMLQ/gC5 QbF0m61HA8uxOQRNVJTFEavpj5uuOdm3zpiXCoWxvZdJCBCTD1lSGgc1PXiBYZnBmdcW oFvjGaOhegiBCb1LRH0ok/IUiGzqwYJ038lqXJNA5CwO6/MvxRlfGffz2PgXDY7Lkb6b jrkvcZTyKtUnbI5tPvNWYsoJZNW4b5IUL5AqlXFCQbGDujNP2ltaxDzKp+k+ZfeiWl2q 6S69WvC9GKeTKe40Cmp8Xgrp1AklOpZmf/QpRzG+eLyqCSmsKGhmA37Q4GUc8g8y2CGx QsUg== X-Forwarded-Encrypted: i=1; AJvYcCUueiAurgQIN8XmAQUXPm9k4OicrSPNi/z9+w0MQRt8f9qRWolR3bOLDDyvl0rt6iTJdjPB0vsSSShEOrMWAsVfGkXu7aUnE+gXDG4J X-Gm-Message-State: AOJu0YwMCZTJX67mPoMPPf7a77ooCKhDY4Irxmd38OBORtK9PGAnjNYE Sw/1XM0+MCVdKnD+z64YO7qt7Dk7s4my5O/AjvEfU/YATQEjeNdCquwC7SOlRo0= X-Google-Smtp-Source: AGHT+IGKl1UyFCDoUX+r1c1fIZ2IpJPAXvxIgAXf1ueFqYJcbwWJ/qwRwwpv4BKDHTmhHmCCt7KoRQ== X-Received: by 2002:a05:600c:4fc9:b0:426:6f27:379a with SMTP id 5b1f17b1804b1-428e6b08fc5mr72683335e9.13.1722848260565; Mon, 05 Aug 2024 01:57:40 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:1068:b792:523c:3f73]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4282bb9d786sm190235665e9.44.2024.08.05.01.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 01:57:40 -0700 (PDT) From: Bartosz Golaszewski Date: Mon, 05 Aug 2024 10:57:31 +0200 Subject: [PATCH v2 1/2] clk: provide devm_clk_get_optional_enabled_with_rate() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240805-clk-new-helper-v2-1-e5fdd1e1d729@linaro.org> References: <20240805-clk-new-helper-v2-0-e5fdd1e1d729@linaro.org> In-Reply-To: <20240805-clk-new-helper-v2-0-e5fdd1e1d729@linaro.org> To: Michael Turquette , Stephen Boyd , Russell King , Marcel Holtmann , Luiz Augusto von Dentz Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3433; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=QK9lIkgLWe2exxp3dFkUI/XLIgdmyowp3vZgiOokUZo=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBmsJQCSVTssWuLUdAD5uSg13OUot2SX1RwmQ8k5 u2csx2SfWCJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZrCUAgAKCRARpy6gFHHX chfSD/99IX6hTwu8Gs17M7ZkqEe0Q5mP7I1wLEfKe5UmeBXmMQCaRw2woFzKpTw6rUmoCh18y2S +w94Oq8Rj0zUU5sv8IrFUGQLKF7raf33pQ23UqctXdqkTJPbu5L0W2b/tPtm1D8JMYY4DVle5r9 E9zvJipdPxtn+8z0EKbSvKk3vhNIrBJNeEdNw074FauUX8nXPkbtvpDc/MXyw/A3Zt/xocpgH7z fQHt97/SLxKE1g5buSmy5m1M0G/bcy1NpAc2y/OUj9V6nrf9k/LQVvzmjOhVdWpNurkCmW7IiwD 5ohUx0K62FbpELUcjCBNfn+D+gPtGcF5+JN7B9Gpwz+fY9SIsXg6AvOWKyHLl/m5TGLDk3aH1eg CP3XJ8zBf9uax6RZ7IjT/kuU+HJi2aT9obtb5852Uy2cxrtnzOQ9+OVm7leHNKeOs2Id1PWDFaJ kzxN2JoV7845C7Pok/Wcjz2yCbDN1OUVCyshdosDkv+Q0RIe6Qlg+qpS+GHocskFURqmU9oOtmK 7+Jy9NgT/Jaoy30NmD9d2VfE6NJ8AUERlfm1CgpvlVo/HigXdKTX6bzK18dHkYwYaDhoThm+H/i Ut1jXnI4SxfZbttwCVNmsN6lMvoheBLSoMTzYSS39V+n4W8EkY96cgebGrcBRtLS+zTw77db/gm pB+X40l4HGzaWrQ== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski There are clock users in the kernel that can't use devm_clk_get_optional_enabled() as they need to set rate after getting the clock and before enabling it. Provide a managed helper that wraps these operations in the correct order. Signed-off-by: Bartosz Golaszewski --- drivers/clk/clk-devres.c | 28 ++++++++++++++++++++++++++++ include/linux/clk.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c index 90e6078fb6e1..82ae1f26e634 100644 --- a/drivers/clk/clk-devres.c +++ b/drivers/clk/clk-devres.c @@ -99,6 +99,34 @@ struct clk *devm_clk_get_optional_enabled(struct device = *dev, const char *id) } EXPORT_SYMBOL_GPL(devm_clk_get_optional_enabled); =20 +struct clk *devm_clk_get_optional_enabled_with_rate(struct device *dev, + const char *id, + unsigned long rate) +{ + struct clk *clk; + int ret; + + clk =3D __devm_clk_get(dev, id, clk_get_optional, NULL, + clk_disable_unprepare); + if (IS_ERR(clk)) + return ERR_CAST(clk); + + ret =3D clk_set_rate(clk, rate); + if (ret) + goto out_put_clk; + + ret =3D clk_prepare_enable(clk); + if (ret) + goto out_put_clk; + + return clk; + +out_put_clk: + devm_clk_put(dev, clk); + return ERR_PTR(ret); +} +EXPORT_SYMBOL_GPL(devm_clk_get_optional_enabled_with_rate); + struct clk_bulk_devres { struct clk_bulk_data *clks; int num_clks; diff --git a/include/linux/clk.h b/include/linux/clk.h index 0fa56d672532..851a0f2cf42c 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -640,6 +640,32 @@ struct clk *devm_clk_get_optional_prepared(struct devi= ce *dev, const char *id); */ struct clk *devm_clk_get_optional_enabled(struct device *dev, const char *= id); =20 +/** + * devm_clk_get_optional_enabled_with_rate - devm_clk_get_optional() + + * clk_set_rate() + + * clk_prepare_enable() + * @dev: device for clock "consumer" + * @id: clock consumer ID + * @rate: new clock rate + * + * Context: May sleep. + * + * Return: a struct clk corresponding to the clock producer, or + * valid IS_ERR() condition containing errno. The implementation + * uses @dev and @id to determine the clock consumer, and thereby + * the clock producer. If no such clk is found, it returns NULL + * which serves as a dummy clk. That's the only difference compared + * to devm_clk_get_enabled(). + * + * The returned clk (if valid) is prepared and enabled and rate was set. + * + * The clock will automatically be disabled, unprepared and freed + * when the device is unbound from the bus. + */ +struct clk *devm_clk_get_optional_enabled_with_rate(struct device *dev, + const char *id, + unsigned long rate); + /** * devm_get_clk_from_child - lookup and obtain a managed reference to a * clock producer from child node. @@ -982,6 +1008,13 @@ static inline struct clk *devm_clk_get_optional_enabl= ed(struct device *dev, return NULL; } =20 +static inline struct clk * +devm_clk_get_optional_enabled_with_rate(struct device *dev, const char *id, + unsigned long rate) +{ + return NULL; +} + static inline int __must_check devm_clk_bulk_get(struct device *dev, int n= um_clks, struct clk_bulk_data *clks) { --=20 2.43.0 From nobody Thu Oct 31 00:18:03 2024 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (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 E85D5155731 for ; Mon, 5 Aug 2024 08:57:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722848266; cv=none; b=WWfOBvQtIVFbHWlia7ksoirnPyc2hSxrPlHqFbARtaR4ntH240kpZFZ7nmg7pC47SNUVd6nfUPgnUG7oQ+HN3FQ1JfouLlIG8hgdfYKRmw6H6eqnmeU2R247elnC+dmwDuGvL/L7vhMcvvwma+EIvxI8NioUMH+oABsAPs2fmds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722848266; c=relaxed/simple; bh=36NnOLplO77djyzlvXQnVzouJ7TT3p/GzId2VWjtvKU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uKh+FmJjCovmGIazEZmexDFkrvYMKPVq3lYEgdzppJf+g7hE6qea3k5mGv5iydaRCkG7W/uDOO3j+iOkbT3RJPll4DSKYBSgIJcJSNeBnTTb4HHsz98T39FxVGbKrdPLqm2fSUlFYaFXYHRZn9VQlI2fbPvydFBcT8caAubdzio= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=d79wxPw3; arc=none smtp.client-ip=209.85.208.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="d79wxPw3" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2eeb1ba0468so151195141fa.0 for ; Mon, 05 Aug 2024 01:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1722848263; x=1723453063; 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=1x43mfYgw7nL6QeZFykXYvWOxjJoouW6Zs1bP+hA8K8=; b=d79wxPw36aEErUug9rJKffog0Cnti1MMHBjBjlCM9lnSk1oCVjqr/SQ1Q0I12oSqnT p8VbXxvvpdivVxktzWAWNi6z7Uh03bLrXfI8JOyCGbXApdlUfQzetS2D4Ba7TBp3ZgOj V+/Sz9DLeVAar37rRe8AGsg/SJZ8n1YLaiFcCg/XBcpbHEOFvWhLImdfAIVsLLpjq/1b NccbEP3TvXyYkMOozvC8Z3xOXR0rePS0HPA1YqD6RGTpKTwyvWsJkWub4aQq7tkIXZ8P k1M5DiIdvqWoXuPPOvhe1MHtw10fR3Qv/Zdt9ZxyLe+XUK29d6qldKse5yz96dC5awbP 5Ytg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722848263; x=1723453063; 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=1x43mfYgw7nL6QeZFykXYvWOxjJoouW6Zs1bP+hA8K8=; b=BcxjMMNIXH3TfjvLxiUA6RHIY/v9BbUbcbfIosv7PFT11RfOKqIhYZi7O0P5jZ630m KS92cbV3cLk2qXQtx7TmXj0z/z6sQuZb4oafMOhrBbuj6u+BAP0Na++1KtytqcBwVQMo +qDZag746qDOUrePPq2P1xsjzywN4S0uwCwDiJ6BU5hVZ3jqdcsimnzGROajGIv/sSm7 kCa6xPgomzBSYWKBnrneMDNidx+Mm8zw30or05di8JAcml1kxI9nqVCHT5+QP4KiKEN3 8ASlNLVY5Ne8Sb4LSoXibzaq7OHSLye0cdNgkZs6fSIOQutbRZEo9qe+D6j4X4HOX/8k 3mUQ== X-Forwarded-Encrypted: i=1; AJvYcCWFfvzwr0uG5YlUZ2dApu/mtLtPNPNJlhB23IXJhMfXEQTbiYefk00RYx7v+xHNUj8+7pbAH1hda6pUHf6GKhbCBHc1VJAvOL/znH7L X-Gm-Message-State: AOJu0Yx39pNe89HK2cZJ8f2FZ4Lk28YvGO8z2KCov1wqpXT01YoDWL/A SC5Bs8Eqc4oQJ97gbCg3LiRzzvzlOv5hc6/BhV59D1147/8OZ5Hi+hMlqaqvRuA= X-Google-Smtp-Source: AGHT+IEtHLKv1Mqn5raXFR4VEU4NyPgTFTmTnh/i5twYhcDnQ4t8OK0kgrYcm9UIv7a6WPsjI+ZCyA== X-Received: by 2002:a2e:a70e:0:b0:2f1:68fb:22ff with SMTP id 38308e7fff4ca-2f168fb244cmr46007531fa.40.1722848262851; Mon, 05 Aug 2024 01:57:42 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:1068:b792:523c:3f73]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4282bb9d786sm190235665e9.44.2024.08.05.01.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 01:57:41 -0700 (PDT) From: Bartosz Golaszewski Date: Mon, 05 Aug 2024 10:57:32 +0200 Subject: [PATCH v2 2/2] Bluetooth: hci_qca: use devm_clk_get_optional_enabled_with_rate() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240805-clk-new-helper-v2-2-e5fdd1e1d729@linaro.org> References: <20240805-clk-new-helper-v2-0-e5fdd1e1d729@linaro.org> In-Reply-To: <20240805-clk-new-helper-v2-0-e5fdd1e1d729@linaro.org> To: Michael Turquette , Stephen Boyd , Russell King , Marcel Holtmann , Luiz Augusto von Dentz Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1648; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=gfW9sB7IaFh6kJb55xtZBjV4gSGbrOIUg13gxXaUtkU=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBmsJQCN3T2vwVhqoe02uzChcgwD5fd76UQWd3cg /H/IqVPDqyJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZrCUAgAKCRARpy6gFHHX ct1lD/454at/a/4w2a/E+ep2QikxeJ5g04JrZ6y1qiIbiHaF0se4x9OQJuKFLcK45ChbwAdNc7T LsddCtqKQZklOMb/7yupQk+A+PKftOu/1mjbhitI2JiUMH4u+csM/q1UcLISIqYYyZqnKPBWCBF A+y7HFbkHS2ic0gsBfK9nvbqXXF1ztM5JdvcrPPoVPgLpfdyXpZcKTUb8nDo7xRsYFraRPyGPSD XWICQiqR9Z0exhrI6x7P3ZsJtNNIQWeNRV1z/DK/k6CWVhD2onk27lBZZI01cc/iaOScfQ7E2fl ZLNRuvjBs2I+nk7T8x7f0UXIZjm54cTdbug3oqA067+jWOxgvrLftZmdFsCtTP0gfDZwgdwhy5S APfADnRCBmeACwMZvVpUCqYnjjw6z1C1zzbiOKBLeQyYFCeto7lXtGXx62PS9N/I6VR1AP0Jboj I26ilgfgcA38QN3xllo1SOSB/rb2rP9QgcMFeLez8cB3jTYp0O5xYy4Gvyg4j+O24C0o3fpfEXg O+kG5s5XfSvk/Mh9tfUdBI4XlF4ZxlkQcJOhRRoi6TM7gI7c5ptR8G2bh4TrrTGP35N0+9nQSna 6PsVzQ0omLO7Z8FYtsrNIh9tl0wb9Nz6cYCnk4EXtNiJ9ol38vEhJytCN9E6kLm4kn6uS5pLy/1 mfqlYqMUNk/0v0w== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Use the new devm_clk_get_optional_enabled_with_rate() clock helper to shrink the code a bit. Signed-off-by: Bartosz Golaszewski --- drivers/bluetooth/hci_qca.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 45adc1560d94..7bee8102caf8 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -2293,13 +2293,6 @@ static int qca_init_regulators(struct qca_power *qca, return 0; } =20 -static void qca_clk_disable_unprepare(void *data) -{ - struct clk *clk =3D data; - - clk_disable_unprepare(clk); -} - static int qca_serdev_probe(struct serdev_device *serdev) { struct qca_serdev *qcadev; @@ -2432,25 +2425,12 @@ static int qca_serdev_probe(struct serdev_device *s= erdev) if (!qcadev->bt_en) power_ctrl_enabled =3D false; =20 - qcadev->susclk =3D devm_clk_get_optional(&serdev->dev, NULL); + qcadev->susclk =3D devm_clk_get_optional_enabled_with_rate( + &serdev->dev, NULL, SUSCLK_RATE_32KHZ); if (IS_ERR(qcadev->susclk)) { dev_warn(&serdev->dev, "failed to acquire clk\n"); return PTR_ERR(qcadev->susclk); } - err =3D clk_set_rate(qcadev->susclk, SUSCLK_RATE_32KHZ); - if (err) - return err; - - err =3D clk_prepare_enable(qcadev->susclk); - if (err) - return err; - - err =3D devm_add_action_or_reset(&serdev->dev, - qca_clk_disable_unprepare, - qcadev->susclk); - if (err) - return err; - } =09 err =3D hci_uart_register_device(&qcadev->serdev_hu, &qca_proto); --=20 2.43.0