cxl/region: Rename misleading variable name @hpa to @hpa_range

@hpa is actually a @hpa_range, rename variables accordingly.

Reviewed-by: Gregory Price <gourry@gourry.net>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Robert Richter <rrichter@amd.com>
Link: https://patch.msgid.link/20260114164837.1076338-2-rrichter@amd.com
Signed-off-by: Dave Jiang <dave.jiang@intel.com>

diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
index ae899f68551f743312077eaa3996ffac1d4ba134..51f1a5545324858520be1c7cb667189ab92a59b4 100644 (file)
--- a/drivers/cxl/core/region.c
+++ b/drivers/cxl/core/region.c
@@ -3474,9 +3474,9 @@ static int match_decoder_by_range(struct device *dev, const void *data)
 }
 
 static struct cxl_decoder *
-cxl_port_find_switch_decoder(struct cxl_port *port, struct range *hpa)
+cxl_port_find_switch_decoder(struct cxl_port *port, struct range *hpa_range)
 {
-       struct device *cxld_dev = device_find_child(&port->dev, hpa,
+       struct device *cxld_dev = device_find_child(&port->dev, hpa_range,
                                                    match_decoder_by_range);
 
        return cxld_dev ? to_cxl_decoder(cxld_dev) : NULL;
@@ -3489,14 +3489,14 @@ cxl_find_root_decoder(struct cxl_endpoint_decoder *cxled)
        struct cxl_port *port = cxled_to_port(cxled);
        struct cxl_root *cxl_root __free(put_cxl_root) = find_cxl_root(port);
        struct cxl_decoder *root, *cxld = &cxled->cxld;
-       struct range *hpa = &cxld->hpa_range;
+       struct range *hpa_range = &cxld->hpa_range;
 
-       root = cxl_port_find_switch_decoder(&cxl_root->port, hpa);
+       root = cxl_port_find_switch_decoder(&cxl_root->port, hpa_range);
        if (!root) {
                dev_err(cxlmd->dev.parent,
                        "%s:%s no CXL window for range %#llx:%#llx\n",
                        dev_name(&cxlmd->dev), dev_name(&cxld->dev),
-                       cxld->hpa_range.start, cxld->hpa_range.end);
+                       hpa_range->start, hpa_range->end);
                return NULL;
        }
 
@@ -3562,7 +3562,7 @@ static int __construct_region(struct cxl_region *cxlr,
                              struct cxl_endpoint_decoder *cxled)
 {
        struct cxl_memdev *cxlmd = cxled_to_memdev(cxled);
-       struct range *hpa = &cxled->cxld.hpa_range;
+       struct range *hpa_range = &cxled->cxld.hpa_range;
        struct cxl_region_params *p;
        struct resource *res;
        int rc;
@@ -3583,7 +3583,7 @@ static int __construct_region(struct cxl_region *cxlr,
        if (!res)
                return -ENOMEM;
 
-       *res = DEFINE_RES_MEM_NAMED(hpa->start, range_len(hpa),
+       *res = DEFINE_RES_MEM_NAMED(hpa_range->start, range_len(hpa_range),
                                    dev_name(&cxlr->dev));
 
        rc = cxl_extended_linear_cache_resize(cxlr, res);
@@ -3666,11 +3666,12 @@ static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd,
 }
 
 static struct cxl_region *
-cxl_find_region_by_range(struct cxl_root_decoder *cxlrd, struct range *hpa)
+cxl_find_region_by_range(struct cxl_root_decoder *cxlrd,
+                        struct range *hpa_range)
 {
        struct device *region_dev;
 
-       region_dev = device_find_child(&cxlrd->cxlsd.cxld.dev, hpa,
+       region_dev = device_find_child(&cxlrd->cxlsd.cxld.dev, hpa_range,
                                       match_region_by_range);
        if (!region_dev)
                return NULL;
@@ -3680,7 +3681,7 @@ cxl_find_region_by_range(struct cxl_root_decoder *cxlrd, struct range *hpa)
 
 int cxl_add_to_region(struct cxl_endpoint_decoder *cxled)
 {
-       struct range *hpa = &cxled->cxld.hpa_range;
+       struct range *hpa_range = &cxled->cxld.hpa_range;
        struct cxl_region_params *p;
        bool attach = false;
        int rc;
@@ -3691,12 +3692,13 @@ int cxl_add_to_region(struct cxl_endpoint_decoder *cxled)
                return -ENXIO;
 
        /*
-        * Ensure that if multiple threads race to construct_region() for @hpa
-        * one does the construction and the others add to that.
+        * Ensure that, if multiple threads race to construct_region()
+        * for the HPA range, one does the construction and the others
+        * add to that.
         */
        mutex_lock(&cxlrd->range_lock);
        struct cxl_region *cxlr __free(put_cxl_region) =
-               cxl_find_region_by_range(cxlrd, hpa);
+               cxl_find_region_by_range(cxlrd, hpa_range);
        if (!cxlr)
                cxlr = construct_region(cxlrd, cxled);
        mutex_unlock(&cxlrd->range_lock);