aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.h
diff options
context:
space:
mode:
authorNarendra K <Narendra_K@dell.com>2010-08-02 08:44:29 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-08-02 12:11:10 -0400
commitb879743f26cb029e41ffe865fb939cfc6fa9be88 (patch)
tree3527b73362148c851be15479a9249f3ed7059527 /drivers/pci/pci.h
parent3d2a531804d16cd8df6dbbb0429c6f143e756049 (diff)
PCI: Fix warnings when CONFIG_DMI unset
This patch fixes the below warnings introduced by the commit 911e1c9b05a8e3559a7aa89083930700a0b9e7ee ("PCI: export SMBIOS provided firmware instance and label to sysfs"). drivers/pci/pci.h: In function ‘pci_create_firmware_label_files’: drivers/pci/pci.h:16: warning: ‘return’ with a value, in function returning void drivers/pci/pci.h: In function ‘pci_remove_firmware_label_files’: drivers/pci/pci.h:18: warning: ‘return’ with a value, in function returning void The warnings are seen because of the below code, doing a retun 0 from the functions 'pci_create_firmware_label_files' and 'pci_remove_firmware_label_files' defined as void. +#ifndef CONFIG_DMI +static inline void pci_create_firmware_label_files(struct pci_dev *pdev) +{ return 0; } +static inline void pci_remove_firmware_label_files(struct pci_dev *pdev) +{ return 0; } Signed-off-by: Narendra K <narendra_k@dell.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.h')
-rw-r--r--drivers/pci/pci.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index d930338e0922..95186caa1492 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -13,9 +13,9 @@ extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
13extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); 13extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
14#ifndef CONFIG_DMI 14#ifndef CONFIG_DMI
15static inline void pci_create_firmware_label_files(struct pci_dev *pdev) 15static inline void pci_create_firmware_label_files(struct pci_dev *pdev)
16{ return 0; } 16{ return; }
17static inline void pci_remove_firmware_label_files(struct pci_dev *pdev) 17static inline void pci_remove_firmware_label_files(struct pci_dev *pdev)
18{ return 0; } 18{ return; }
19#else 19#else
20extern void pci_create_firmware_label_files(struct pci_dev *pdev); 20extern void pci_create_firmware_label_files(struct pci_dev *pdev);
21extern void pci_remove_firmware_label_files(struct pci_dev *pdev); 21extern void pci_remove_firmware_label_files(struct pci_dev *pdev);