Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 07:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI: Use driver_set_override() instead of open-coding

Browse Source 
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.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220419113435.246203-6-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Krzysztof Kozlowski 2022-04-19 13:34:28 +02:00 committed by Greg Kroah-Hartman
parent 01ed100276
commit 23d99baf9d
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/pci/pci-sysfs.c
View File

@ -567,31 +567,11 @@ static ssize_t driver_override_store(struct device *dev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
char *driver_override, *old, *cp; int ret;
/* We need to keep extra room for a newline */ ret = driver_set_override(dev, &pdev->driver_override, buf, count);
if (count >= (PAGE_SIZE - 1)) if (ret)
return -EINVAL; return ret;
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);
kfree(old);
return count; return count;
} }

6
include/linux/pci.h
View File

@ -516,7 +516,11 @@ struct pci_dev {
u16 acs_cap; /* ACS Capability offset */ u16 acs_cap; /* ACS Capability offset */
phys_addr_t rom; /* Physical address if not from BAR */ phys_addr_t rom; /* Physical address if not from BAR */
size_t romlen; /* Length 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 */ unsigned long priv_flags; /* Private flags for the PCI driver */