Re: [PATCH v11 04/20] cxl/port: Rename @comp_map to @reg_map in struct cxl_register_map

Jonathan Cameron
2023-10-02T14:34:42Z

On Wed, 27 Sep 2023 17:43:23 +0200
Robert Richter <rrichter@amd.com> wrote:

> 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>
Makes sense. Can we pull the one I moaned about in the previous
patch into this one?

That way the renames are all together.

If not, I'm fine with just moaning :) Whichever patch split
you go with across this and previous...

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.co>
> ---
> drivers/cxl/core/port.c | 2 +-
> drivers/cxl/cxl.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
> index 99df86d72dbc..b993dea61436 100644
> --- a/drivers/cxl/core/port.c
> +++ b/drivers/cxl/core/port.c
> @@ -712,7 +712,7 @@ static int cxl_port_setup_regs(struct cxl_port *port,
> {
> if (dev_is_platform(port->uport_dev))
> return 0;
> - return cxl_setup_comp_regs(&port->dev, &port->comp_map,
> + return cxl_setup_comp_regs(&port->dev, &port->reg_map,
> component_reg_phys);
> }
>
> diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
> index 68abf9944383..3a51b58a66d0 100644
> --- a/drivers/cxl/cxl.h
> +++ b/drivers/cxl/cxl.h
> @@ -572,7 +572,7 @@ struct cxl_dax_region {
> * @regions: cxl_region_ref instances, regions mapped by this port
> * @parent_dport: dport that points to this port in the parent
> * @decoder_ida: allocator for decoder ids
> - * @comp_map: component register capability mappings
> + * @reg_map: component and ras register mapping parameters
> * @nr_dports: number of entries in @dports
> * @hdm_end: track last allocated HDM decoder instance for allocation ordering
> * @commit_end: cursor to track highest committed decoder for commit ordering
> @@ -592,7 +592,7 @@ struct cxl_port {
> struct xarray regions;
> struct cxl_dport *parent_dport;
> struct ida decoder_ida;
> - struct cxl_register_map comp_map;
> + struct cxl_register_map reg_map;
> int nr_dports;
> int hdm_end;
> int commit_end;