Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit ccd609538e99d3465a8d498f3655098f44cd253b

Authored by Yuanhan Liu
Committed by John W. Linville
1 parent 7bf7a71e0f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/bcma/host_pci.c
Diff comments   View file @ ccd6095
... ... @@ -238,7 +238,7 @@
238 238 pci_set_drvdata(dev, NULL);
239 239 }
240 240  
241   -#ifdef CONFIG_PM
  241 +#ifdef CONFIG_PM_SLEEP
242 242 static int bcma_host_pci_suspend(struct device *dev)
243 243 {
244 244 struct pci_dev *pdev = to_pci_dev(dev);
245 245  
... ... @@ -261,11 +261,11 @@
261 261 bcma_host_pci_resume);
262 262 #define BCMA_PM_OPS (&bcma_pm_ops)
263 263  
264   -#else /* CONFIG_PM */
  264 +#else /* CONFIG_PM_SLEEP */
265 265  
266 266 #define BCMA_PM_OPS NULL
267 267  
268   -#endif /* CONFIG_PM */
  268 +#endif /* CONFIG_PM_SLEEP */
269 269  
270 270 static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
271 271 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },