lkml.org 
[lkml]   [2022]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 05/11] PCI: Use driver_set_override() instead of open-coding
    Date
    Use a helper to set driver_override to the reduce amount of duplicated
    code. Make the driver_override field const char, because it is not
    modified by the core and it matches other subsystems.

    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Acked-by: Bjorn Helgaas <bhelgaas@google.com>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    ---
    drivers/pci/pci-sysfs.c | 28 ++++------------------------
    include/linux/pci.h | 6 +++++-
    2 files changed, 9 insertions(+), 25 deletions(-)

    diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
    index 602f0fb0b007..5c42965c32c2 100644
    --- a/drivers/pci/pci-sysfs.c
    +++ b/drivers/pci/pci-sysfs.c
    @@ -567,31 +567,11 @@ static ssize_t driver_override_store(struct device *dev,
    const char *buf, size_t count)
    {
    struct pci_dev *pdev = to_pci_dev(dev);
    - char *driver_override, *old, *cp;
    -
    - /* We need to keep extra room for a newline */
    - if (count >= (PAGE_SIZE - 1))
    - return -EINVAL;
    -
    - driver_override = kstrndup(buf, count, GFP_KERNEL);
    - if (!driver_override)
    - return -ENOMEM;
    -
    - cp = strchr(driver_override, '\n');
    - if (cp)
    - *cp = '\0';
    -
    - device_lock(dev);
    - old = pdev->driver_override;
    - if (strlen(driver_override)) {
    - pdev->driver_override = driver_override;
    - } else {
    - kfree(driver_override);
    - pdev->driver_override = NULL;
    - }
    - device_unlock(dev);
    + int ret;

    - kfree(old);
    + ret = driver_set_override(dev, &pdev->driver_override, buf, count);
    + if (ret)
    + return ret;

    return count;
    }
    diff --git a/include/linux/pci.h b/include/linux/pci.h
    index b957eeb89c7a..5ecbb845aa21 100644
    --- a/include/linux/pci.h
    +++ b/include/linux/pci.h
    @@ -516,7 +516,11 @@ struct pci_dev {
    u16 acs_cap; /* ACS Capability offset */
    phys_addr_t rom; /* Physical address if not from BAR */
    size_t romlen; /* Length if not from BAR */
    - char *driver_override; /* Driver name to force a match */
    + /*
    + * Driver name to force a match. Do not set directly, because core
    + * frees it. Use driver_set_override() to set or clear it.
    + */
    + const char *driver_override;

    unsigned long priv_flags; /* Private flags for the PCI driver */

    --
    2.32.0
    \
     
     \ /
      Last update: 2022-03-16 16:08    [W:3.525 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site