From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8464C11F66 for ; Wed, 14 Jul 2021 17:25:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B87C3613C0 for ; Wed, 14 Jul 2021 17:25:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237956AbhGNR2V (ORCPT ); Wed, 14 Jul 2021 13:28:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229756AbhGNR2V (ORCPT ); Wed, 14 Jul 2021 13:28:21 -0400 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32D57C061764 for ; Wed, 14 Jul 2021 10:25:29 -0700 (PDT) Received: by mail-ot1-x32e.google.com with SMTP id b14-20020a056830310eb02904c7e78705f4so3242227ots.13 for ; Wed, 14 Jul 2021 10:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=4Kumx3nS5y9nz9rWe/sEdbMMcdp5ffd/gZuxBQbNya4=; b=IYaHXcWbRW58qcNEf1nShgqUxB13n2Xl2hBMhmSAeknojrMiTnIh/2w4JC4WBEpmz3 SjsdAEJcE6QHDole4Fe40mfdpoQe7eTNuRHMvrbu5DY4npCrSRtmnEGzwk0kXkCXLwqj VqEYbOkVuh5L0askie7wCgU6nQz3cBemjnAAOgjOejBCCFamATFLSzf7i4AQl7DnQJVP BngZkmi/1fck4UB01js5oqRrhRLFw7+YHWPRWaRMAjehCeUjQmVelorxsV8o3FEoUtvz 8UostLjfjTNF/+gHVkAP/xzWPeAScK9lPVT1L4pZ/ebzY1x+KYYtJp71a8k1+K+l680o 9wbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=4Kumx3nS5y9nz9rWe/sEdbMMcdp5ffd/gZuxBQbNya4=; b=E3UUhYRa46njxs8a+aXIF93pufvPCSaGjJ5Rg/TwSO/uMc8t+POOFdBvEfMiZF8uXj 23s1ZzM90Q2+R/SmLvC1Jv6EjWuSAbuE4SXv3lBZj4hrThspZIQ/DyETdm34CHXH/7Rx l7glE7yu/c63GGDVtsGZYpjWkuGhL3hcS3SULrP8pTqaGmIwvqjFW0hTxL8gapKe2reP qlFZ2j9u2tQHfoUwVSOMT4wO1KLrx58zYe9J/1nk+pWkSGSCFGJEp5mASrEAn07u6NND 59FeL4uvCYldqQTHhpK7HCbOG5DE5qJCpUhCMCR6tOVosM85oAB89MjlVR8b0++97ZIB 6IVQ== X-Gm-Message-State: AOAM531bcvXG5eY1fqieOAXgc8xWKhOxnry+jPoIvCoUFrceE2i7rtsI 7oxkig6ldxNubMrCQbx2DCTUBA== X-Google-Smtp-Source: ABdhPJxJhQltkVBXqegdnO9IaV/+FtL3Hn5ISoeGdm1cXIRjDt1pi4WI2yOMSRkOnK2cup+024ClQg== X-Received: by 2002:a9d:4916:: with SMTP id e22mr9268121otf.112.1626283528429; Wed, 14 Jul 2021 10:25:28 -0700 (PDT) Received: from yoga (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id p9sm553538otl.64.2021.07.14.10.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 10:25:27 -0700 (PDT) Date: Wed, 14 Jul 2021 12:25:25 -0500 From: Bjorn Andersson To: Dmitry Baryshkov Cc: Andy Gross , Rob Herring , Liam Girdwood , Mark Brown , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org Subject: Re: [PATCH v3 4/7] Bluetooth: hci_qca: merge qca_power into qca_serdev Message-ID: References: <20210621223141.1638189-1-dmitry.baryshkov@linaro.org> <20210621223141.1638189-5-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210621223141.1638189-5-dmitry.baryshkov@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Mon 21 Jun 17:31 CDT 2021, Dmitry Baryshkov wrote: > There is no need to allocate separate structure for handling regulators > used by QCA chips, we gain nothing from it. Move all used data fields > directly to struct qca_serdev. > Reviewed-by: Bjorn Andersson Regards, Bjorn > Signed-off-by: Dmitry Baryshkov > --- > drivers/bluetooth/hci_qca.c | 58 ++++++++++++++----------------------- > 1 file changed, 22 insertions(+), 36 deletions(-) > > diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c > index 3704dbadba1d..9cc8a9153d76 100644 > --- a/drivers/bluetooth/hci_qca.c > +++ b/drivers/bluetooth/hci_qca.c > @@ -208,20 +208,15 @@ 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 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; > u32 init_speed; > u32 oper_speed; > const char *firmware_name; > @@ -1602,7 +1597,7 @@ static int qca_regulator_init(struct hci_uart *hu) > * off the voltage regulator. > */ > 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) > @@ -1945,20 +1940,19 @@ static int qca_power_off(struct hci_dev *hdev) > > static int qca_regulator_enable(struct qca_serdev *qcadev) > { > - struct qca_power *power = qcadev->bt_power; > int ret; > > /* 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) > @@ -1969,38 +1963,37 @@ 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, > - const struct qca_vreg *vregs, size_t num_vregs) > +static int qca_init_regulators(struct device *dev, struct qca_serdev *qca, > + const struct qca_vreg *vregs, size_t num_vregs) > { > struct regulator_bulk_data *bulk; > int ret; > int i; > > - bulk = devm_kcalloc(qca->dev, num_vregs, sizeof(*bulk), GFP_KERNEL); > + if (!num_vregs) > + return 0; > + > + 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; > > @@ -2044,21 +2037,15 @@ static int qca_serdev_probe(struct serdev_device *serdev) > if ((qca_is_wcn399x(data->soc_type) || > qca_is_wcn6750(data->soc_type))) { > qcadev->btsoc_type = data->soc_type; > - qcadev->bt_power = devm_kzalloc(&serdev->dev, > - sizeof(struct qca_power), > - GFP_KERNEL); > - if (!qcadev->bt_power) > - return -ENOMEM; > - > - qcadev->bt_power->dev = &serdev->dev; > - err = qca_init_regulators(qcadev->bt_power, data->vregs, > + > + err = qca_init_regulators(&serdev->dev, 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); > @@ -2139,11 +2126,10 @@ 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; > > if ((qca_is_wcn399x(qcadev->btsoc_type) || > qca_is_wcn6750(qcadev->btsoc_type)) && > - power->vregs_on) > + qcadev->vregs_on) > qca_power_shutdown(&qcadev->serdev_hu); > else if (qcadev->susclk) > clk_disable_unprepare(qcadev->susclk); > -- > 2.30.2 >