aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bcma/host_pci.c
diff options
context:
space:
mode:
authorYuanhan Liu <yuanhan.liu@linux.intel.com>2012-10-16 10:59:02 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-10-29 15:19:31 -0400
commitccd609538e99d3465a8d498f3655098f44cd253b (patch)
tree56c6fcb31f9e3112a3fed18b89bd9ce55d237a1e /drivers/bcma/host_pci.c
parent7bf7a71e0f7ad69358d01f2a7ba7faa9428db90b (diff)
bcma: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP
This will fix warnings like following when CONFIG_PM_SLEEP is not set: warning: 'xxx_suspend' defined but not used [-Wunused-function] warning: 'xxx_resume' defined but not used [-Wunused-function] Because SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) Only references the callbacks on CONFIG_PM_SLEEP (instead of CONFIG_PM). Cc: John W. Linville <linville@tuxdriver.com> Cc: "Rafał Miłecki" <zajec5@gmail.com> Cc: linux-wireless@vger.kernel.org Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/host_pci.c')
-rw-r--r--drivers/bcma/host_pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index b6b4b5ebd4c2..98fdc3e014e7 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -238,7 +238,7 @@ static void __devexit bcma_host_pci_remove(struct pci_dev *dev)
238 pci_set_drvdata(dev, NULL); 238 pci_set_drvdata(dev, NULL);
239} 239}
240 240
241#ifdef CONFIG_PM 241#ifdef CONFIG_PM_SLEEP
242static int bcma_host_pci_suspend(struct device *dev) 242static int bcma_host_pci_suspend(struct device *dev)
243{ 243{
244 struct pci_dev *pdev = to_pci_dev(dev); 244 struct pci_dev *pdev = to_pci_dev(dev);
@@ -261,11 +261,11 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend,
261 bcma_host_pci_resume); 261 bcma_host_pci_resume);
262#define BCMA_PM_OPS (&bcma_pm_ops) 262#define BCMA_PM_OPS (&bcma_pm_ops)
263 263
264#else /* CONFIG_PM */ 264#else /* CONFIG_PM_SLEEP */
265 265
266#define BCMA_PM_OPS NULL 266#define BCMA_PM_OPS NULL
267 267
268#endif /* CONFIG_PM */ 268#endif /* CONFIG_PM_SLEEP */
269 269
270static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { 270static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
271 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) }, 271 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },