diff options
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index f09654a7d1fa..7d84c8bbcf3f 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
@@ -2650,12 +2650,13 @@ static void megasas_shutdown_controller(struct megasas_instance *instance, | |||
2650 | return; | 2650 | return; |
2651 | } | 2651 | } |
2652 | 2652 | ||
2653 | #ifdef CONFIG_PM | ||
2653 | /** | 2654 | /** |
2654 | * megasas_suspend - driver suspend entry point | 2655 | * megasas_suspend - driver suspend entry point |
2655 | * @pdev: PCI device structure | 2656 | * @pdev: PCI device structure |
2656 | * @state: PCI power state to suspend routine | 2657 | * @state: PCI power state to suspend routine |
2657 | */ | 2658 | */ |
2658 | static int __devinit | 2659 | static int |
2659 | megasas_suspend(struct pci_dev *pdev, pm_message_t state) | 2660 | megasas_suspend(struct pci_dev *pdev, pm_message_t state) |
2660 | { | 2661 | { |
2661 | struct Scsi_Host *host; | 2662 | struct Scsi_Host *host; |
@@ -2687,7 +2688,7 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) | |||
2687 | * megasas_resume- driver resume entry point | 2688 | * megasas_resume- driver resume entry point |
2688 | * @pdev: PCI device structure | 2689 | * @pdev: PCI device structure |
2689 | */ | 2690 | */ |
2690 | static int __devinit | 2691 | static int |
2691 | megasas_resume(struct pci_dev *pdev) | 2692 | megasas_resume(struct pci_dev *pdev) |
2692 | { | 2693 | { |
2693 | int rval; | 2694 | int rval; |
@@ -2782,12 +2783,16 @@ fail_ready_state: | |||
2782 | 2783 | ||
2783 | return -ENODEV; | 2784 | return -ENODEV; |
2784 | } | 2785 | } |
2786 | #else | ||
2787 | #define megasas_suspend NULL | ||
2788 | #define megasas_resume NULL | ||
2789 | #endif | ||
2785 | 2790 | ||
2786 | /** | 2791 | /** |
2787 | * megasas_detach_one - PCI hot"un"plug entry point | 2792 | * megasas_detach_one - PCI hot"un"plug entry point |
2788 | * @pdev: PCI device structure | 2793 | * @pdev: PCI device structure |
2789 | */ | 2794 | */ |
2790 | static void megasas_detach_one(struct pci_dev *pdev) | 2795 | static void __devexit megasas_detach_one(struct pci_dev *pdev) |
2791 | { | 2796 | { |
2792 | int i; | 2797 | int i; |
2793 | struct Scsi_Host *host; | 2798 | struct Scsi_Host *host; |