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

Commit 33139b21 authored by Jiri Slaby's avatar Jiri Slaby Committed by James Bottomley
Browse files

[SCSI] megaraid_sas: fix suspend/resume sections 



megaraid_sas suspend and resume are inappropriatelly placed in
__devinit section. Remove those placements and make the stuff
dependent on CONFIG_PM.

While at it, mark remove function as __devexit.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Acked-by: default avatar"Yang, Bo" <Bo.Yang@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 655d722c

drivers/scsi/megaraid/megaraid_sas.c

+8 −3
Original line number Diff line number Diff line
@@ -2650,12 +2650,13 @@ static void megasas_shutdown_controller(struct megasas_instance *instance, 
	return;

}



#ifdef CONFIG_PM

/**

 * megasas_suspend -	driver suspend entry point

 * @pdev:		PCI device structure

 * @state:		PCI power state to suspend routine

 */

static int __devinit

static int

megasas_suspend(struct pci_dev *pdev, pm_message_t state)

{

	struct Scsi_Host *host;
@@ -2687,7 +2688,7 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) 
 * megasas_resume-      driver resume entry point

 * @pdev:               PCI device structure

 */

static int __devinit

static int

megasas_resume(struct pci_dev *pdev)

{

	int rval;
@@ -2782,12 +2783,16 @@ megasas_resume(struct pci_dev *pdev) 


	return -ENODEV;

}

#else

#define megasas_suspend	NULL

#define megasas_resume	NULL

#endif



/**

 * megasas_detach_one -	PCI hot"un"plug entry point

 * @pdev:		PCI device structure

 */

static void megasas_detach_one(struct pci_dev *pdev)

static void __devexit megasas_detach_one(struct pci_dev *pdev)

{

	int i;

	struct Scsi_Host *host;