lkml.org 
[lkml]   [2008]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH #repost] SCSI: megaraid, fix suspend/resume sections
    Date
    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


    \
     
     \ /
      Last update: 2008-05-01 17:59    [W:0.020 / U:149.864 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site