Skip to content

Commit d8add49

Browse files
Robert Richterdjbw
authored andcommitted
cxl/port: Rename @comp_map to @reg_map in struct cxl_register_map
Name the field @reg_map, because @reg_map->host will be used for mapping operations beyond component registers (i.e. AER registers). This is valid for all occurrences of @comp_map. Change them all. Signed-off-by: Robert Richter <rrichter@amd.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: https://lore.kernel.org/r/20231018171713.1883517-5-rrichter@amd.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 33d9c98 commit d8add49

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

drivers/cxl/core/port.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ static int cxl_port_setup_regs(struct cxl_port *port,
712712
{
713713
if (dev_is_platform(port->uport_dev))
714714
return 0;
715-
return cxl_setup_comp_regs(&port->dev, &port->comp_map,
715+
return cxl_setup_comp_regs(&port->dev, &port->reg_map,
716716
component_reg_phys);
717717
}
718718

@@ -729,9 +729,9 @@ static int cxl_dport_setup_regs(struct device *host, struct cxl_dport *dport,
729729
* register probing, and fixup @host after the fact, since @host may be
730730
* NULL.
731731
*/
732-
rc = cxl_setup_comp_regs(dport->dport_dev, &dport->comp_map,
732+
rc = cxl_setup_comp_regs(dport->dport_dev, &dport->reg_map,
733733
component_reg_phys);
734-
dport->comp_map.host = host;
734+
dport->reg_map.host = host;
735735
return rc;
736736
}
737737

drivers/cxl/cxl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ struct cxl_dax_region {
572572
* @regions: cxl_region_ref instances, regions mapped by this port
573573
* @parent_dport: dport that points to this port in the parent
574574
* @decoder_ida: allocator for decoder ids
575-
* @comp_map: component register capability mappings
575+
* @reg_map: component and ras register mapping parameters
576576
* @nr_dports: number of entries in @dports
577577
* @hdm_end: track last allocated HDM decoder instance for allocation ordering
578578
* @commit_end: cursor to track highest committed decoder for commit ordering
@@ -592,7 +592,7 @@ struct cxl_port {
592592
struct xarray regions;
593593
struct cxl_dport *parent_dport;
594594
struct ida decoder_ida;
595-
struct cxl_register_map comp_map;
595+
struct cxl_register_map reg_map;
596596
int nr_dports;
597597
int hdm_end;
598598
int commit_end;
@@ -620,15 +620,15 @@ struct cxl_rcrb_info {
620620
/**
621621
* struct cxl_dport - CXL downstream port
622622
* @dport_dev: PCI bridge or firmware device representing the downstream link
623-
* @comp_map: component register capability mappings
623+
* @reg_map: component and ras register mapping parameters
624624
* @port_id: unique hardware identifier for dport in decoder target list
625625
* @rcrb: Data about the Root Complex Register Block layout
626626
* @rch: Indicate whether this dport was enumerated in RCH or VH mode
627627
* @port: reference to cxl_port that contains this downstream port
628628
*/
629629
struct cxl_dport {
630630
struct device *dport_dev;
631-
struct cxl_register_map comp_map;
631+
struct cxl_register_map reg_map;
632632
int port_id;
633633
struct cxl_rcrb_info rcrb;
634634
bool rch;

0 commit comments

Comments
 (0)