ACK.
Thanks.
Bo Yang
-----Original Message-----
From: Jiri Slaby [mailto:jirislaby@gmail.com]
Sent: Thursday, May 01, 2008 11:56 AM
To: DL-MegaRAID Linux
Cc: linux-scsi@vger.kernel.org; James.Bottomley@HansenPartnership.com;
akpm@linux-foundation.org; linux-kernel@vger.kernel.org; Jiri Slaby
Subject: [PATCH #repost] SCSI: megaraid, 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: Jiri Slaby <jirislaby@gmail.com>
Cc: Neela Syam Kolli <megaraidlinux@lsi.com>
---
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 b937e9c..a90944c 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,
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 @@ fail_ready_state:
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;
--
1.5.4.5
--
| Ryan Hope | reiser4 for 2.6.27-rc1 |
| Tim Tassonis | reiser4 for 2.6.27-rc1 |
| Rafael J. Wysocki | 2.6.26-rc9-git12: Reported regressions from 2.6.25 |
| hooanon05 | [PATCH 63/67] aufs mount helper |
git: | |
| Petko Manolov | git and binary files |
| Wink Saville | Resolving conflicts |
| Ken Pratt | pack operation is thrashing my server |
| Jeff King | Re: Use of tac in git-rebase--interactive |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| Julien TOUCHE | setting up ssh tunnel/vpn |
| Ray Percival | Re: Real men don't attack straw men |
| Michael | Performance: OpenVPN vs IPsec |
| Pietro Cerutti | Re: [patch] enhance powerd(8) to handle max temperature |
| Søren Schmidt | Re: Patch RFC: Promise SATA300 TX4 hardware bug workaround. |
| Kris Kennaway | Re: Problems with FreeBSD 6.0 |
| Ceri Davies | Using any network interface whatsoever |
