mei: me: put pm callbacks under PM_SLEEP ifdef
Subsystems (2)
PATCH 1/2 mei: me: put pm callbacks under PM_SLEEP ifdef
From: Alexander Usyskin <[email protected]>
This will eliminate compilation warning:
drivers/misc/mei/pci-me.c:303:12: warning: mei_me_pci_suspend defined but not used [-Wunused-function] static int mei_me_pci_suspend(struct device *device) drivers/misc/mei/pci-me.c:323:12: warning: mei_me_pci_resume defined but not used [-Wunused-function] static int mei_me_pci_resume(struct device *device)
Signed-off-by Alexander Usyskin <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/pci-me.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/mei/pci-me.c +3 -2
@@ -269,7 +269,7 @@ static void mei_me_remove(struct pci_dev *pdev) } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int mei_me_pci_suspend (struct device *device) {struct pci_dev *pdev =to_pci_dev (device);
@@ -329,11 +329,12 @@ static int mei_me_pci_resume(struct device *device)return 0 ; } + static SIMPLE_DEV_PM_OPS(mei_me_pm_ops, mei_me_pci_suspend, mei_me_pci_resume);#define MEI_ME_PM_OPS (&mei_me_pm_ops)#else #define MEI_ME_PM_OPS NULL -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ /* * PCI driver structure */
Signature · 1 line
1.8.5.3
PATCH 2/2 mei: txe: put pm callbacks under PM_SLEEP ifdef
PCI suspend resume callbacks should be defined
under CONFIG_PM_SLEEP
Signed-off-by Tomas Winkler <[email protected]>
Signed-off-by Alexander Usyskin <[email protected]>
--- drivers/misc/mei/pci-txe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/mei/pci-txe.c +2 -2
@@ -209,7 +209,7 @@ static void mei_txe_remove(struct pci_dev *pdev) } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int mei_txe_pci_suspend (struct device *device) {struct pci_dev *pdev =to_pci_dev (device);
@@ -273,7 +273,7 @@ static SIMPLE_DEV_PM_OPS(mei_txe_pm_ops,#define MEI_TXE_PM_OPS (&mei_txe_pm_ops)#else #define MEI_TXE_PM_OPS NULL -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ /* * PCI driver structure */
Signature · 1 line
1.8.5.3