diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-15 15:11:08 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-15 15:11:08 -0600 |
commit | 6db645f99cc5357ab5520982b85396487c113dc9 (patch) | |
tree | 0431721fd4cc7b3814371aa734c0b6cfa439be36 /drivers/pci/pci-driver.c | |
parent | 1a76dceaf4268f904292ca126d1cb9af091fd516 (diff) | |
parent | 0aec75a5963e8d72c59a42055c5b5c524893b910 (diff) | |
download | linux-stable-6db645f99cc5357ab5520982b85396487c113dc9.tar.gz linux-stable-6db645f99cc5357ab5520982b85396487c113dc9.tar.bz2 linux-stable-6db645f99cc5357ab5520982b85396487c113dc9.zip |
Merge branch 'pci/misc'
- Update kernel-doc to match function prototypes (Mauro Carvalho Chehab)
- Bounds-check "pci=resource_alignment=" requests (Bjorn Helgaas)
- Fix integer overflow in "pci=resource_alignment=" requests (Colin Ian
King)
- Remove unused HAVE_PCI_SET_MWI definition (Heiner Kallweit)
- Reduce pci_set_cacheline_size() message to debug level (Heiner Kallweit)
* pci/misc:
PCI: Reduce pci_set_cacheline_size() message to debug level
PCI: Remove unused HAVE_PCI_SET_MWI
PCI: Fix overflow in command-line resource alignment requests
PCI: Bounds-check command-line resource alignment requests
PCI: Fix kernel-doc markup
# Conflicts:
# drivers/pci/pci-driver.c
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r-- | drivers/pci/pci-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 60b452ae6631..ec44a79e951a 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -163,7 +163,7 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv, } /** - * store_new_id - sysfs frontend to pci_add_dynid() + * new_id_store - sysfs frontend to pci_add_dynid() * @driver: target device driver * @buf: buffer for scanning device ID data * @count: input size @@ -231,7 +231,7 @@ static ssize_t new_id_store(struct device_driver *driver, const char *buf, static DRIVER_ATTR_WO(new_id); /** - * store_remove_id - remove a PCI device ID from this driver + * remove_id_store - remove a PCI device ID from this driver * @driver: target device driver * @buf: buffer for scanning device ID data * @count: input size |