aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-06-19 08:54:49 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-06-20 12:44:35 -0400
commitd6d88c832eaea6c6947ddf7b664601930a9f8a14 (patch)
tree8ddfebda7b16c562f13efce9efa2a3f74e85d884 /drivers
parent8356aad43005ecb771a67efb4182dc038b4187e3 (diff)
PCI: use __weak consistently
Use "__weak" instead of the gcc-specific "__attribute__ ((weak))" Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci-sysfs.c2
-rw-r--r--drivers/pci/pci.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 86c63fe45d11..a0b435f20bd6 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1112,7 +1112,7 @@ static struct bin_attribute pcie_config_attr = {
1112 .write = pci_write_config, 1112 .write = pci_write_config,
1113}; 1113};
1114 1114
1115int __attribute__ ((weak)) pcibios_add_platform_entries(struct pci_dev *dev) 1115int __weak pcibios_add_platform_entries(struct pci_dev *dev)
1116{ 1116{
1117 return 0; 1117 return 0;
1118} 1118}
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 447e83472c01..8f4a5ea543fc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1349,7 +1349,7 @@ void pcim_pin_device(struct pci_dev *pdev)
1349 * is the default implementation. Architecture implementations can 1349 * is the default implementation. Architecture implementations can
1350 * override this. 1350 * override this.
1351 */ 1351 */
1352void __attribute__ ((weak)) pcibios_disable_device (struct pci_dev *dev) {} 1352void __weak pcibios_disable_device (struct pci_dev *dev) {}
1353 1353
1354static void do_pci_disable_device(struct pci_dev *dev) 1354static void do_pci_disable_device(struct pci_dev *dev)
1355{ 1355{
@@ -1413,8 +1413,8 @@ pci_disable_device(struct pci_dev *dev)
1413 * Sets the PCIe reset state for the device. This is the default 1413 * Sets the PCIe reset state for the device. This is the default
1414 * implementation. Architecture implementations can override this. 1414 * implementation. Architecture implementations can override this.
1415 */ 1415 */
1416int __attribute__ ((weak)) pcibios_set_pcie_reset_state(struct pci_dev *dev, 1416int __weak pcibios_set_pcie_reset_state(struct pci_dev *dev,
1417 enum pcie_reset_state state) 1417 enum pcie_reset_state state)
1418{ 1418{
1419 return -EINVAL; 1419 return -EINVAL;
1420} 1420}
@@ -3851,7 +3851,7 @@ static void __devinit pci_no_domains(void)
3851 * greater than 0xff). This is the default implementation. Architecture 3851 * greater than 0xff). This is the default implementation. Architecture
3852 * implementations can override this. 3852 * implementations can override this.
3853 */ 3853 */
3854int __attribute__ ((weak)) pci_ext_cfg_avail(struct pci_dev *dev) 3854int __weak pci_ext_cfg_avail(struct pci_dev *dev)
3855{ 3855{
3856 return 1; 3856 return 1;
3857} 3857}