From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 ECE67483806 for ; Mon, 5 Oct 2026 12:21:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791202920; cv=none; b=iRqspnSMCHxIAJg1uteiGgZfKVzZHQtkh996h1vwJWctZYeiVp+qu8OXLzolOdpLua/k5lutkMbyp+aPrA37wayaYWp4ereOzWOPL1WeZeZrXu05Y/88hnHBhuUyc5f1zSdWXl/ju51ra31Q2Sj4K3dBUyGtGrle2wpu2pzjKKA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791202920; c=relaxed/simple; bh=1Xn9dR7yMaJeAlVajeQ1a98Xi3BPhNLay7aDn0ORCsU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iI18G16QCBKyM0HB1rIQ/wNDV97UNfXEMyF75s6595EeFrKiEkYbxojI9qwHSglfNG4fSZHApHV3ZJT3wRNTMzJ9Qx467d0uZu/L16HWSG3F/1I72dDhKRRXZiGLGBEJ6q/qTVsstkNTZ+tjSnGq+/OSbflsPdgSSgaWERloyEc= 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=Cmr0TpkZ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Z0MG9NC8; arc=none smtp.client-ip=205.220.168.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="Cmr0TpkZ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Z0MG9NC8" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 695CFIcR2897502 for ; Mon, 5 Oct 2026 12:21:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 7YOAMYRVUcEG/JAVsfgbkUt6h7/k6zJmH94/0qM7FAo=; b=Cmr0TpkZBjjgkdC8 Kfbc1eTI3bAz6UBLK2diptX4ZUbYDdZXmqeb62ksJ+eUwub3EflkMBFgSzXRvod6 9Dssthd//NdSzdu+IJRnhHDTyw4vp9l/9XmX5QO0QvrDkOY3ywZXRSbJSGjxBdFF cfcEeQ8KQKIfkdFAqSePQXbA1YCS/dPML2/hl6n4y6Y0wrwf20/5Fk/sglNWiyI6 xDxLSK2FrQ+fVC9SS8AQDRRGG3O+ZbbP+SSxcq9HQbD8OzuLnq/sglr171G0/+xH 9ZZkf6IIkmHt8B6b7ICdEvrKwGSf1FiZJ82KAArTwAA09zvpPzW3D+KEQ/rIZ965 YvZEcQ== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4h2sssnra8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 05 Oct 2026 12:21:57 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-93ae8e7e546so291228285a.1 for ; Mon, 05 Oct 2026 05:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1791202916; x=1791807716; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7YOAMYRVUcEG/JAVsfgbkUt6h7/k6zJmH94/0qM7FAo=; b=Z0MG9NC8RQv4oznZ0WKPrAAAujIoQpFmTccpXNt11QuNdjgDfwj9Nx+hbqzw6EPNxS SGcGNouV+yeAU3desQ6k05www9QDDrv25klVnmke3+wD83C1R6DrGxMNeB8NFKF2bMjw 8xinyg4FQZK4hgeVNN4HYgPS720U9tkpvXGuj0ypCjEWNI1wEIoAIZ4DKPgUuB+LgnN8 7ZOvbAy7CpR0F2g99xx0iQIC2P8kXr8JqdkwqtMnJSafgjhidoQDG7uUn8r6nzJHJdL/ 2TlP/X05lQLXx4q4JsYn7sgDUZWGlWR/XdnCOxwgJrCs6yhjEBOc8JHSwII6VFrfoUES TWWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791202916; x=1791807716; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=7YOAMYRVUcEG/JAVsfgbkUt6h7/k6zJmH94/0qM7FAo=; b=FZkH4aJEpTg9d+oDa3OPu0Bvi/ID3gUjZVY6xAo3v2SSE55Z5LF2BBJg46zTOQlU4L 6IAJm+kSBfGQ6sbIVSzyo/EpPZ6JvU83/TRCaRGk0h5HHAGLe6xuPPG0y7lW1QX/C+cE DzrA4ATGkVeMrqM2LZFNAHtM1rYIfNE3M3djoEiE+HaS9twFXKJo8uKmEvs+WkSNrHaF 2smNEFihSmIEDwMuBVLTdyV4RsrVpzRz/C129yTpP9nL9931uYGRQw8AuwO+F0VyVf8F +P8okXDqOj8CsHKiK27jkBOcJT1teZLrrXyBC0KJoIRJeS1xlb0DRSAcl2G+wFeUP0Cz ZgNQ== X-Forwarded-Encrypted: i=1; AKwUvBwNXAwnkbq+vXqXzau9lBodkUNj3xJhl4at8hnAz5U2G5pIzxSeDWUud2VxUjHSu7b55c0sj3RU8isZ@vger.kernel.org X-Gm-Message-State: AFuF++kosyMZmvzRja469BSNbejv8nGyswPUSsVheshYaK9XgjqNXxQ3 Jhq1VhmS3Wp5T5rNcscNNaJben7hdyuhEiRrmpUDzyZ/BPa4iAVd05L4c6Yw9qcizv/KBPh7DfO jWCUMDfTpo4ZalStPFhbA80rR11/YatI1YeJ0swIw8jXDzPGKytj5ezRetpIGFKaB X-Gm-Gg: AYBFou1+0TvKC4/JLqBFp9vX5qsUOHolFwgPaN7nIw6mQPhUUkUrQDuhuTdv/kwXALz ZOQ96ibsB735kXSvrql+D80I8PzRHtit0nSQKlEe2MuVPgGzp0zGHbfwbfphzDEMOQ3wv//fmZ3 NkAY6aXK+8XFlve6qKYfr573Op468vlSxurm6YSjGn0OXXfCi/L93YMs3cNOSTh2zjDJY8/kFPl AK55RntBbzVrN3t+ImLf3YbI5/ddwYIKDoraDpShTXBLNSBUoougB5DyAxcJnAj6yGkWPLv000E QuHsKSw4AsHLuNiJhUHs5CyO+kNzDV1/apFq6kF9yAJ8inG/QGD5LShw8dfMFNYmkzv8so8UG5S OoA2zQviufPHnE4V9zfOkTsvz/3KYmzDRrwlGISiTWNFX/wZ280vWzyGJyb8kJ1ADOJ2A2hZsnN n0WIrtniOtROiwVgBlWRJ809RP5OvAYhh1o2rjL6O/oIoiCX5ZnTIXLa2tYA7ITtnQUr7a9g== X-Received: by 2002:a05:620a:a196:20b0:93c:5b8f:482 with SMTP id af79cd13be357-93cf16e2fcemr1397178485a.25.1791202915880; Mon, 05 Oct 2026 05:21:55 -0700 (PDT) X-Received: by 2002:a05:620a:a196:20b0:93c:5b8f:482 with SMTP id af79cd13be357-93cf16e2fcemr1397173585a.25.1791202915259; Mon, 05 Oct 2026 05:21:55 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com (90-182-211-1.rcp.o2.cz. [90.182.211.1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a027698f13sm324157425e9.1.2026.10.05.05.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 05:21:54 -0700 (PDT) From: Loic Poulain Date: Mon, 05 Oct 2026 14:21:36 +0200 Subject: [PATCH v7 6/8] Bluetooth: hci_qca: Flatten struct qca_power into struct qca_serdev Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261005-monza-wireless-v7-6-5a6de7662dcb@oss.qualcomm.com> References: <20261005-monza-wireless-v7-0-5a6de7662dcb@oss.qualcomm.com> In-Reply-To: <20261005-monza-wireless-v7-0-5a6de7662dcb@oss.qualcomm.com> To: Manivannan Sadhasivam , Bartosz Golaszewski , Marcel Holtmann , Luiz Augusto von Dentz , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, Manivannan Sadhasivam , Loic Poulain , Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Proofpoint-Spam-Info: AW1haW4tMjYxMDA1MDA0OCBTYWx0ZWRfX2/i2tJXX9HnK uNRLOVvFEItN3CCIZjZIFbW1cxtakbCUIv0/a9me+d14MgbBgkUBuw77rQRFIC05GuVlCt2kPzS LYfTuTCb5EfYANzyEkRoYJmoj2KXbYo= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDA1MDA0OCBTYWx0ZWRfX5CVpwpYOgOTa 45vWijTU2Hh3NkoDFDv2sjYG8kx+bofRX/cIZ1wX2WqYmz1418ftH0bWOT3plIeGQ+Cl8abj9ms ckTJjC0HiXNcv37SzrIjpFO/lXULMrb+xUieq82ZF3W1kzXWPXUteSFag5POm/PWGwaReBwb+9v Q+IgjZDecNEU5H/TTklXpfeJAVC9of7fJXpxd5s4Bb9Hr5w8UXsfMeau5Yzvf9JPaTInBF7byjw 0qcetm1YazD7kCyYHzDXqkDAeVi+c/rz3EuEkbZK3JAy9zKad9caMSxWQ3CZIaWrUE9Tcv/plRR yXEeD05O1kuZGBRS+vYRzyLKz/SxNSJoA6zlN5D+RZ0uq2vJFA48wsbABeCQi32rmi6Boh6nRw+ Iz9XfI1tNE/ZrB4VJqaRV/rDTLQR0mLkRgXeW+/HI7NK/yAmsawLxLOAe1r6BFV7PLw0e8vrxnm qzZlmUCrSDUweZMCfIw== X-Proofpoint-GUID: n4XD-w7H0YVjj7KtgOhttmM5IAx9Btp9 X-Authority-Analysis: v=2.4 cv=HqjjiETS c=1 sm=1 tr=0 ts=6ac39665 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=zRh97aRZNhiOMYVz81Er1w==:17 a=IkcTkHD0fZMA:10 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=IDBDRlgmZ80N7xYWSSYA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: n4XD-w7H0YVjj7KtgOhttmM5IAx9Btp9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-10-05_03,2026-10-05_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 phishscore=0 bulkscore=0 adultscore=0 impostorscore=0 suspectscore=0 spamscore=0 malwarescore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2610050048 struct qca_power currently only groups a handful of fields (vreg_bulk, num_vregs, vregs_on, pwrseq) that are exclusively used from struct qca_serdev, via its embedded bt_power member. The extra indirection level does not provide any isolation or reuse benefit, and just adds qcadev->bt_power. noise throughout the driver. Drop struct qca_power and move its fields directly into struct qca_serdev, updating qca_init_regulators() to take a struct qca_serdev pointer instead. No functional change intended. Suggested-by: Dmitry Baryshkov Signed-off-by: Loic Poulain --- drivers/bluetooth/hci_qca.c | 91 +++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 52 deletions(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index b6ec1a57248e2cf4bd138898ffc5cad45b1b4a8b..55a3b6c1c2ce7cdfa9e2d55a7ab97298d69b0057 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -211,21 +211,16 @@ struct qca_device_data { /* * Platform data for the QCA Bluetooth power driver. */ -struct qca_power { - struct device *dev; - struct regulator_bulk_data *vreg_bulk; - int num_vregs; - bool vregs_on; - struct pwrseq_desc *pwrseq; -}; - struct qca_serdev { struct hci_uart serdev_hu; struct gpio_desc *bt_en; struct gpio_desc *sw_ctrl; struct clk *susclk; enum qca_btsoc_type btsoc_type; - struct qca_power bt_power; + struct regulator_bulk_data *vreg_bulk; + int num_vregs; + bool vregs_on; + struct pwrseq_desc *pwrseq; u32 init_speed; u32 oper_speed; bool bdaddr_property_broken; @@ -1779,7 +1774,7 @@ static int qca_regulator_init(struct hci_uart *hu) */ qcadev = serdev_device_get_drvdata(hu->serdev); - if (!qcadev->bt_power.vregs_on) { + if (!qcadev->vregs_on) { serdev_device_close(hu->serdev); ret = qca_regulator_enable(qcadev); if (ret) @@ -1876,8 +1871,8 @@ static int qca_power_on(struct hci_dev *hdev) msleep(150); } - if (qcadev->bt_power.pwrseq) - pwrseq_power_on(qcadev->bt_power.pwrseq); + if (qcadev->pwrseq) + pwrseq_enable(qcadev->pwrseq); } clear_bit(QCA_BT_OFF, &qca->flags); @@ -2230,7 +2225,6 @@ static void qca_power_off(struct hci_uart *hu) unsigned long flags; enum qca_btsoc_type soc_type = qca_soc_type(hu); bool sw_ctrl_state; - struct qca_power *power; /* From this point we go into power off state. But serial port may * still be open, stop queueing the IBS data and flush all the buffered @@ -2248,7 +2242,6 @@ static void qca_power_off(struct hci_uart *hu) return; qcadev = serdev_device_get_drvdata(hu->serdev); - power = &qcadev->bt_power; switch (soc_type) { case QCA_WCN3988: @@ -2268,8 +2261,8 @@ static void qca_power_off(struct hci_uart *hu) break; } - if (power->pwrseq) { - pwrseq_disable(power->pwrseq); + if (qcadev->pwrseq) { + pwrseq_disable(qcadev->pwrseq); set_bit(QCA_BT_OFF, &qca->flags); return; } @@ -2325,23 +2318,22 @@ static int qca_hci_shutdown(struct hci_dev *hdev) static int qca_regulator_enable(struct qca_serdev *qcadev) { - struct qca_power *power = &qcadev->bt_power; int ret; - if (power->pwrseq) - return pwrseq_enable(power->pwrseq); + if (qcadev->pwrseq) + return pwrseq_enable(qcadev->pwrseq); /* Already enabled */ - if (power->vregs_on) + if (qcadev->vregs_on) return 0; - BT_DBG("enabling %d regulators)", power->num_vregs); + BT_DBG("enabling %d regulators)", qcadev->num_vregs); - ret = regulator_bulk_enable(power->num_vregs, power->vreg_bulk); + ret = regulator_bulk_enable(qcadev->num_vregs, qcadev->vreg_bulk); if (ret) return ret; - power->vregs_on = true; + qcadev->vregs_on = true; ret = clk_prepare_enable(qcadev->susclk); if (ret) @@ -2352,38 +2344,35 @@ static int qca_regulator_enable(struct qca_serdev *qcadev) static void qca_regulator_disable(struct qca_serdev *qcadev) { - struct qca_power *power; - if (!qcadev) return; - power = &qcadev->bt_power; - /* Already disabled? */ - if (!power->vregs_on) + if (!qcadev->vregs_on) return; - regulator_bulk_disable(power->num_vregs, power->vreg_bulk); - power->vregs_on = false; + regulator_bulk_disable(qcadev->num_vregs, qcadev->vreg_bulk); + qcadev->vregs_on = false; clk_disable_unprepare(qcadev->susclk); } -static int qca_init_regulators(struct qca_power *qca, +static int qca_init_regulators(struct qca_serdev *qcadev, const struct qca_vreg *vregs, size_t num_vregs) { + struct device *dev = &qcadev->serdev_hu.serdev->dev; struct regulator_bulk_data *bulk; int ret; int i; - bulk = devm_kcalloc(qca->dev, num_vregs, sizeof(*bulk), GFP_KERNEL); + bulk = devm_kcalloc(dev, num_vregs, sizeof(*bulk), GFP_KERNEL); if (!bulk) return -ENOMEM; for (i = 0; i < num_vregs; i++) bulk[i].supply = vregs[i].name; - ret = devm_regulator_bulk_get(qca->dev, num_vregs, bulk); + ret = devm_regulator_bulk_get(dev, num_vregs, bulk); if (ret < 0) return ret; @@ -2393,8 +2382,8 @@ static int qca_init_regulators(struct qca_power *qca, return ret; } - qca->vreg_bulk = bulk; - qca->num_vregs = num_vregs; + qcadev->vreg_bulk = bulk; + qcadev->num_vregs = num_vregs; return 0; } @@ -2422,7 +2411,7 @@ static int qca_serdev_get_m2_pwrseq(struct qca_serdev *qcadev) if (IS_ERR(pwrseq)) return PTR_ERR(pwrseq); - qcadev->bt_power.pwrseq = pwrseq; + qcadev->pwrseq = pwrseq; return devm_add_action_or_reset(&serdev->dev, qca_serdev_put_pwrseq, pwrseq); } @@ -2471,7 +2460,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) case QCA_WCN6855: case QCA_WCN7850: /* M.2 connector modules are powered by the pwrseq acquired above. */ - if (qcadev->bt_power.pwrseq) + if (qcadev->pwrseq) break; if (!device_property_present(&serdev->dev, "enable-gpios")) { @@ -2481,7 +2470,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) * let's use the power sequencer. Otherwise, let's * drive everything ourselves. */ - qcadev->bt_power.pwrseq = devm_pwrseq_get(&serdev->dev, + qcadev->pwrseq = devm_pwrseq_get(&serdev->dev, "bluetooth"); /* @@ -2490,21 +2479,20 @@ static int qca_serdev_probe(struct serdev_device *serdev) * through the power sequence. In such cases, fall through * to follow the legacy flow. */ - if (IS_ERR(qcadev->bt_power.pwrseq)) - qcadev->bt_power.pwrseq = NULL; + if (IS_ERR(qcadev->pwrseq)) + qcadev->pwrseq = NULL; else break; } - qcadev->bt_power.dev = &serdev->dev; - err = qca_init_regulators(&qcadev->bt_power, data->vregs, + err = qca_init_regulators(qcadev, data->vregs, data->num_vregs); if (err) { BT_ERR("Failed to init regulators:%d", err); return err; } - qcadev->bt_power.vregs_on = false; + qcadev->vregs_on = false; qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable", GPIOD_OUT_LOW); @@ -2538,10 +2526,10 @@ static int qca_serdev_probe(struct serdev_device *serdev) case QCA_QCA6390: if (dev_of_node(&serdev->dev)) { - qcadev->bt_power.pwrseq = devm_pwrseq_get(&serdev->dev, + qcadev->pwrseq = devm_pwrseq_get(&serdev->dev, "bluetooth"); - if (IS_ERR(qcadev->bt_power.pwrseq)) - return PTR_ERR(qcadev->bt_power.pwrseq); + if (IS_ERR(qcadev->pwrseq)) + return PTR_ERR(qcadev->pwrseq); break; } fallthrough; @@ -2565,16 +2553,16 @@ static int qca_serdev_probe(struct serdev_device *serdev) } } - if (qcadev->bt_power.pwrseq) { - bt_en_available = pwrseq_is_controllable(qcadev->bt_power.pwrseq); + if (qcadev->pwrseq) { + bt_en_available = pwrseq_is_controllable(qcadev->pwrseq); if (!bt_en_available) { /* The host cannot gate the BT power individually. * Treat it as always-on and drop the pwrseq handle. * The descriptor itself is still released by devres, * so dropping the handle here is not a leak. */ - pwrseq_enable(qcadev->bt_power.pwrseq); - qcadev->bt_power.pwrseq = NULL; + pwrseq_enable(qcadev->pwrseq); + qcadev->pwrseq = NULL; } } @@ -2612,7 +2600,6 @@ static int qca_serdev_probe(struct serdev_device *serdev) static void qca_serdev_remove(struct serdev_device *serdev) { struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); - struct qca_power *power = &qcadev->bt_power; switch (qcadev->btsoc_type) { case QCA_WCN3988: @@ -2622,7 +2609,7 @@ static void qca_serdev_remove(struct serdev_device *serdev) case QCA_WCN6750: case QCA_WCN6855: case QCA_WCN7850: - if (power->vregs_on) + if (qcadev->vregs_on) qca_power_off(&qcadev->serdev_hu); break; default: -- 2.34.1