Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccd60953 authored by Yuanhan Liu's avatar Yuanhan Liu Committed by John W. Linville
Browse files

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: default avatarYuanhan Liu <yuanhan.liu@linux.intel.com>
Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7bf7a71e

drivers/bcma/host_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void __devexit bcma_host_pci_remove(struct pci_dev *dev) 
	pci_set_drvdata(dev, NULL);

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int bcma_host_pci_suspend(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);
@@ -261,11 +261,11 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, 
			 bcma_host_pci_resume);

#define BCMA_PM_OPS	(&bcma_pm_ops)



#else /* CONFIG_PM */

#else /* CONFIG_PM_SLEEP */



#define BCMA_PM_OPS     NULL



#endif /* CONFIG_PM */

#endif /* CONFIG_PM_SLEEP */



static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },