PCI/pwrctrl: pwrseq: Rename private struct and pointers for consistency

Previously the pwrseq, tc9563, and slot pwrctrl drivers used different
naming conventions for their private data structs and pointers to them,
which makes patches hard to read.

Rename structs, variables, and functions to reduce boiler-plate and start
with "pwrseq":

  struct pci_pwrctrl_pwrseq_data       -> struct pwrseq_pwrctrl
  struct pci_pwrctrl ctx               -> struct pci_pwrctrl pwrctrl
  struct pci_pwrctrl_pwrseq_data *data -> struct pwrseq_pwrctrl *pwrseq
  struct pci_pwrctrl_pwrseq_pdata      -> struct pwrseq_pwrctrl_pdata
  pci_pwrctrl_pwrseq_qcom_wcn_pdata    -> pwrseq_pwrctrl_qcom_wcn_pdata
  pci_pwrctrl_pwrseq_probe()           -> pwrseq_pwrctrl_probe()
  devm_pci_pwrctrl_pwrseq_power_off()  -> devm_pwrseq_pwrctrl_power_off()
  pci_pwrctrl_pwrseq_qcm_wcn_validate_device() -> pwrseq_pwrctrl_qcm_wcn_validate_device()

No functional change intended.

[bhelgaas: move "pwrseq" to beginning, also rename functions]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Link: https://patch.msgid.link/20260115-pci-pwrctrl-rework-v5-1-9d26da3ce903@oss.qualcomm.com

diff --git a/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c b/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
index 4e664e7b8dd23f592c0392efbf6728fc5bf9093f..e33beda149cfe5c589e3a071de8a9029a6df4b7d 100644 (file)
--- a/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
+++ b/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
@@ -13,12 +13,12 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 
-struct pci_pwrctrl_pwrseq_data {
-       struct pci_pwrctrl ctx;
+struct pwrseq_pwrctrl {
+       struct pci_pwrctrl pwrctrl;
        struct pwrseq_desc *pwrseq;
 };
 
-struct pci_pwrctrl_pwrseq_pdata {
+struct pwrseq_pwrctrl_pdata {
        const char *target;
        /*
         * Called before doing anything else to perform device-specific
@@ -27,7 +27,7 @@ struct pci_pwrctrl_pwrseq_pdata {
        int (*validate_device)(struct device *dev);
 };
 
-static int pci_pwrctrl_pwrseq_qcm_wcn_validate_device(struct device *dev)
+static int pwrseq_pwrctrl_qcm_wcn_validate_device(struct device *dev)
 {
        /*
         * Old device trees for some platforms already define wifi nodes for
@@ -47,22 +47,22 @@ static int pci_pwrctrl_pwrseq_qcm_wcn_validate_device(struct device *dev)
        return 0;
 }
 
-static const struct pci_pwrctrl_pwrseq_pdata pci_pwrctrl_pwrseq_qcom_wcn_pdata = {
+static const struct pwrseq_pwrctrl_pdata pwrseq_pwrctrl_qcom_wcn_pdata = {
        .target = "wlan",
-       .validate_device = pci_pwrctrl_pwrseq_qcm_wcn_validate_device,
+       .validate_device = pwrseq_pwrctrl_qcm_wcn_validate_device,
 };
 
-static void devm_pci_pwrctrl_pwrseq_power_off(void *data)
+static void devm_pwrseq_pwrctrl_power_off(void *data)
 {
        struct pwrseq_desc *pwrseq = data;
 
        pwrseq_power_off(pwrseq);
 }
 
-static int pci_pwrctrl_pwrseq_probe(struct platform_device *pdev)
+static int pwrseq_pwrctrl_probe(struct platform_device *pdev)
 {
-       const struct pci_pwrctrl_pwrseq_pdata *pdata;
-       struct pci_pwrctrl_pwrseq_data *data;
+       const struct pwrseq_pwrctrl_pdata *pdata;
+       struct pwrseq_pwrctrl *pwrseq;
        struct device *dev = &pdev->dev;
        int ret;
 
@@ -76,28 +76,28 @@ static int pci_pwrctrl_pwrseq_probe(struct platform_device *pdev)
                        return ret;
        }
 
-       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
-       if (!data)
+       pwrseq = devm_kzalloc(dev, sizeof(*pwrseq), GFP_KERNEL);
+       if (!pwrseq)
                return -ENOMEM;
 
-       data->pwrseq = devm_pwrseq_get(dev, pdata->target);
-       if (IS_ERR(data->pwrseq))
-               return dev_err_probe(dev, PTR_ERR(data->pwrseq),
+       pwrseq->pwrseq = devm_pwrseq_get(dev, pdata->target);
+       if (IS_ERR(pwrseq->pwrseq))
+               return dev_err_probe(dev, PTR_ERR(pwrseq->pwrseq),
                                     "Failed to get the power sequencer\n");
 
-       ret = pwrseq_power_on(data->pwrseq);
+       ret = pwrseq_power_on(pwrseq->pwrseq);
        if (ret)
                return dev_err_probe(dev, ret,
                                     "Failed to power-on the device\n");
 
-       ret = devm_add_action_or_reset(dev, devm_pci_pwrctrl_pwrseq_power_off,
-                                      data->pwrseq);
+       ret = devm_add_action_or_reset(dev, devm_pwrseq_pwrctrl_power_off,
+                                      pwrseq->pwrseq);
        if (ret)
                return ret;
 
-       pci_pwrctrl_init(&data->ctx, dev);
+       pci_pwrctrl_init(&pwrseq->pwrctrl, dev);
 
-       ret = devm_pci_pwrctrl_device_set_ready(dev, &data->ctx);
+       ret = devm_pci_pwrctrl_device_set_ready(dev, &pwrseq->pwrctrl);
        if (ret)
                return dev_err_probe(dev, ret,
                                     "Failed to register the pwrctrl wrapper\n");
@@ -105,34 +105,34 @@ static int pci_pwrctrl_pwrseq_probe(struct platform_device *pdev)
        return 0;
 }
 
-static const struct of_device_id pci_pwrctrl_pwrseq_of_match[] = {
+static const struct of_device_id pwrseq_pwrctrl_of_match[] = {
        {
                /* ATH11K in QCA6390 package. */
                .compatible = "pci17cb,1101",
-               .data = &pci_pwrctrl_pwrseq_qcom_wcn_pdata,
+               .data = &pwrseq_pwrctrl_qcom_wcn_pdata,
        },
        {
                /* ATH11K in WCN6855 package. */
                .compatible = "pci17cb,1103",
-               .data = &pci_pwrctrl_pwrseq_qcom_wcn_pdata,
+               .data = &pwrseq_pwrctrl_qcom_wcn_pdata,
        },
        {
                /* ATH12K in WCN7850 package. */
                .compatible = "pci17cb,1107",
-               .data = &pci_pwrctrl_pwrseq_qcom_wcn_pdata,
+               .data = &pwrseq_pwrctrl_qcom_wcn_pdata,
        },
        { }
 };
-MODULE_DEVICE_TABLE(of, pci_pwrctrl_pwrseq_of_match);
+MODULE_DEVICE_TABLE(of, pwrseq_pwrctrl_of_match);
 
-static struct platform_driver pci_pwrctrl_pwrseq_driver = {
+static struct platform_driver pwrseq_pwrctrl_driver = {
        .driver = {
                .name = "pci-pwrctrl-pwrseq",
-               .of_match_table = pci_pwrctrl_pwrseq_of_match,
+               .of_match_table = pwrseq_pwrctrl_of_match,
        },
-       .probe = pci_pwrctrl_pwrseq_probe,
+       .probe = pwrseq_pwrctrl_probe,
 };
-module_platform_driver(pci_pwrctrl_pwrseq_driver);
+module_platform_driver(pwrseq_pwrctrl_driver);
 
 MODULE_AUTHOR("Bartosz Golaszewski <bartosz.golaszewski@linaro.org>");
 MODULE_DESCRIPTION("Generic PCI Power Control module for power sequenced devices");