lkml.org 
[lkml]   [2023]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 03/23] cxl: Rename member @dport of struct cxl_dport to @dev
    Date
    From: Robert Richter <rrichter@amd.com>

    Reading code like dport->dport does not immediately suggest that this
    points to the corresponding device structure of the dport. Rename
    struct member @dport to @dev.

    While at it, also rename @new argument of add_dport() to @dport. This
    better describes the variable as a dport (e.g. new->dport becomes to
    dport->dev).

    Signed-off-by: Robert Richter <rrichter@amd.com>
    Signed-off-by: Terry Bowman <terry.bowman@amd.com>
    ---
    drivers/cxl/core/port.c | 20 ++++++++++----------
    drivers/cxl/core/region.c | 4 ++--
    drivers/cxl/cxl.h | 4 ++--
    3 files changed, 14 insertions(+), 14 deletions(-)

    diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
    index 618865ca6a9f..66f567480238 100644
    --- a/drivers/cxl/core/port.c
    +++ b/drivers/cxl/core/port.c
    @@ -605,7 +605,7 @@ static int devm_cxl_link_parent_dport(struct device *host,
    if (!parent_dport)
    return 0;

    - rc = sysfs_create_link(&port->dev.kobj, &parent_dport->dport->kobj,
    + rc = sysfs_create_link(&port->dev.kobj, &parent_dport->dev->kobj,
    "parent_dport");
    if (rc)
    return rc;
    @@ -658,7 +658,7 @@ static struct cxl_port *cxl_port_alloc(struct device *uport,
    if (iter->host_bridge)
    port->host_bridge = iter->host_bridge;
    else if (parent_dport->rch)
    - port->host_bridge = parent_dport->dport;
    + port->host_bridge = parent_dport->dev;
    else
    port->host_bridge = iter->uport;
    dev_dbg(uport, "host-bridge: %s\n", dev_name(port->host_bridge));
    @@ -847,22 +847,22 @@ static struct cxl_dport *find_dport(struct cxl_port *port, int id)
    return NULL;
    }

    -static int add_dport(struct cxl_port *port, struct cxl_dport *new)
    +static int add_dport(struct cxl_port *port, struct cxl_dport *dport)
    {
    struct cxl_dport *dup;
    int rc;

    device_lock_assert(&port->dev);
    - dup = find_dport(port, new->port_id);
    + dup = find_dport(port, dport->port_id);
    if (dup) {
    dev_err(&port->dev,
    "unable to add dport%d-%s non-unique port id (%s)\n",
    - new->port_id, dev_name(new->dport),
    - dev_name(dup->dport));
    + dport->port_id, dev_name(dport->dev),
    + dev_name(dup->dev));
    return -EBUSY;
    }

    - rc = xa_insert(&port->dports, (unsigned long)new->dport, new,
    + rc = xa_insert(&port->dports, (unsigned long)dport->dev, dport,
    GFP_KERNEL);
    if (rc)
    return rc;
    @@ -895,8 +895,8 @@ static void cxl_dport_remove(void *data)
    struct cxl_dport *dport = data;
    struct cxl_port *port = dport->port;

    - xa_erase(&port->dports, (unsigned long) dport->dport);
    - put_device(dport->dport);
    + xa_erase(&port->dports, (unsigned long) dport->dev);
    + put_device(dport->dev);
    }

    static void cxl_dport_unlink(void *data)
    @@ -954,7 +954,7 @@ __devm_cxl_add_dport(struct cxl_port *port, struct device *dport_dev,
    dev_dbg(dport_dev, "Component Registers found for dport: %pa\n",
    &component_reg_phys);

    - dport->dport = dport_dev;
    + dport->dev = dport_dev;
    dport->port_id = port_id;
    dport->component_reg_phys = component_reg_phys;
    dport->port = port;
    diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
    index f822de44bee0..8886c6201998 100644
    --- a/drivers/cxl/core/region.c
    +++ b/drivers/cxl/core/region.c
    @@ -1162,7 +1162,7 @@ static int cxl_port_setup_targets(struct cxl_port *port,
    dev_dbg(&cxlr->dev, "%s:%s: %s expected %s at %d\n",
    dev_name(port->uport), dev_name(&port->dev),
    dev_name(&cxlsd->cxld.dev),
    - dev_name(ep->dport->dport),
    + dev_name(ep->dport->dev),
    cxl_rr->nr_targets_set);
    return -ENXIO;
    }
    @@ -1173,7 +1173,7 @@ static int cxl_port_setup_targets(struct cxl_port *port,
    cxl_rr->nr_targets_set += inc;
    dev_dbg(&cxlr->dev, "%s:%s target[%d] = %s for %s:%s @ %d\n",
    dev_name(port->uport), dev_name(&port->dev),
    - cxl_rr->nr_targets_set - 1, dev_name(ep->dport->dport),
    + cxl_rr->nr_targets_set - 1, dev_name(ep->dport->dev),
    dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), pos);

    return 0;
    diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
    index 29e0bd2b8f2a..a8bda2c74a85 100644
    --- a/drivers/cxl/cxl.h
    +++ b/drivers/cxl/cxl.h
    @@ -594,7 +594,7 @@ struct cxl_rcrb_info {

    /**
    * struct cxl_dport - CXL downstream port
    - * @dport: PCI bridge or firmware device representing the downstream link
    + * @dev: PCI bridge or firmware device representing the downstream link
    * @port: reference to cxl_port that contains this downstream port
    * @port_id: unique hardware identifier for dport in decoder target list
    * @component_reg_phys: downstream port component registers
    @@ -602,7 +602,7 @@ struct cxl_rcrb_info {
    * @rcrb: Data about the Root Complex Register Block layout
    */
    struct cxl_dport {
    - struct device *dport;
    + struct device *dev;
    struct cxl_port *port;
    int port_id;
    resource_size_t component_reg_phys;
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-05-24 01:25    [W:7.545 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site