diff options
author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2014-04-17 13:48:07 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-22 12:54:07 -0400 |
commit | 9edbcd2252b5ef148177c9f2c11a56469cf5db52 (patch) | |
tree | 73c4cadcd5f5299cca5dadd12d86bc36faf62ea1 | |
parent | ef4858c64e836b0b9dbdb9ece13ce932d9fcd4ad (diff) |
PCI: Remove pcibios_add_platform_entries()
Remove pcibios_add_platform_entries(). Architecture-specific attributes
can be achieved by setting pdev->dev.groups.
Link: https://lkml.kernel.org/r/alpine.LFD.2.11.1404141101500.1529@denkbrett
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/pci/pci-sysfs.c | 10 | ||||
-rw-r--r-- | include/linux/pci.h | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 3db1c7ff5dd3..b7333fa5f80d 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
@@ -1273,11 +1273,6 @@ static struct bin_attribute pcie_config_attr = { | |||
1273 | .write = pci_write_config, | 1273 | .write = pci_write_config, |
1274 | }; | 1274 | }; |
1275 | 1275 | ||
1276 | int __weak pcibios_add_platform_entries(struct pci_dev *dev) | ||
1277 | { | ||
1278 | return 0; | ||
1279 | } | ||
1280 | |||
1281 | static ssize_t reset_store(struct device *dev, | 1276 | static ssize_t reset_store(struct device *dev, |
1282 | struct device_attribute *attr, const char *buf, | 1277 | struct device_attribute *attr, const char *buf, |
1283 | size_t count) | 1278 | size_t count) |
@@ -1393,11 +1388,6 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) | |||
1393 | pdev->rom_attr = attr; | 1388 | pdev->rom_attr = attr; |
1394 | } | 1389 | } |
1395 | 1390 | ||
1396 | /* add platform-specific attributes */ | ||
1397 | retval = pcibios_add_platform_entries(pdev); | ||
1398 | if (retval) | ||
1399 | goto err_rom_file; | ||
1400 | |||
1401 | /* add sysfs entries for various capabilities */ | 1391 | /* add sysfs entries for various capabilities */ |
1402 | retval = pci_create_capabilities_sysfs(pdev); | 1392 | retval = pci_create_capabilities_sysfs(pdev); |
1403 | if (retval) | 1393 | if (retval) |
diff --git a/include/linux/pci.h b/include/linux/pci.h index a95aac7ad37f..84182b153b21 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -1572,7 +1572,6 @@ extern unsigned long pci_hotplug_io_size; | |||
1572 | extern unsigned long pci_hotplug_mem_size; | 1572 | extern unsigned long pci_hotplug_mem_size; |
1573 | 1573 | ||
1574 | /* Architecture-specific versions may override these (weak) */ | 1574 | /* Architecture-specific versions may override these (weak) */ |
1575 | int pcibios_add_platform_entries(struct pci_dev *dev); | ||
1576 | void pcibios_disable_device(struct pci_dev *dev); | 1575 | void pcibios_disable_device(struct pci_dev *dev); |
1577 | void pcibios_set_master(struct pci_dev *dev); | 1576 | void pcibios_set_master(struct pci_dev *dev); |
1578 | int pcibios_set_pcie_reset_state(struct pci_dev *dev, | 1577 | int pcibios_set_pcie_reset_state(struct pci_dev *dev, |