On Mon, Jul 20, 2020 at 07:04:19PM +0530, Vaibhav Gupta wrote:
> With legacy PM, drivers themselves were responsible for managing the
> device's power states and takes care of register states.
>
> After upgrading to the generic structure, PCI core will take care of
> required tasks and drivers should do only device-specific operations.
>
> The driver was calling pci_save/restore_state(), pci_choose_state(),
> pci_enable/disable_device() and pci_set_power_state() which is no more
> needed.
>
> Compile-tested only.
>
> Signed-off-by: Vaibhav Gupta <vaibhavgupta40@xxxxxxxxx>
> ---
> drivers/scsi/esas2r/esas2r.h | 5 ++--
> drivers/scsi/esas2r/esas2r_init.c | 48 +++++++++----------------------
> drivers/scsi/esas2r/esas2r_main.c | 3 +-
> 3 files changed, 18 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
> index 7f43b95f4e94..6ad3e0871ef0 100644
> --- a/drivers/scsi/esas2r/esas2r.h
> +++ b/drivers/scsi/esas2r/esas2r.h
> @@ -996,8 +996,9 @@ void esas2r_adapter_tasklet(unsigned long context);
> irqreturn_t esas2r_interrupt(int irq, void *dev_id);
> irqreturn_t esas2r_msi_interrupt(int irq, void *dev_id);
> void esas2r_kickoff_timer(struct esas2r_adapter *a);
> -int esas2r_suspend(struct pci_dev *pcid, pm_message_t state);
> -int esas2r_resume(struct pci_dev *pcid);
> +
> +extern const struct dev_pm_ops esas2r_pm_ops;
> +
> void esas2r_fw_event_off(struct esas2r_adapter *a);
> void esas2r_fw_event_on(struct esas2r_adapter *a);
> bool esas2r_nvram_write(struct esas2r_adapter *a, struct esas2r_request *rq,
> diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c
> index eb7d139ffc00..6c5854969791 100644
> --- a/drivers/scsi/esas2r/esas2r_init.c
> +++ b/drivers/scsi/esas2r/esas2r_init.c
> @@ -640,53 +640,31 @@ void esas2r_kill_adapter(int i)
> }
> }
>
> -int esas2r_suspend(struct pci_dev *pdev, pm_message_t state)
> +static int __maybe_unused esas2r_suspend(struct device *dev)
> {
> - struct Scsi_Host *host = pci_get_drvdata(pdev);
> - u32 device_state;
> + struct Scsi_Host *host = dev_get_drvdata(dev);
> struct esas2r_adapter *a = (struct esas2r_adapter *)host->hostdata;
>
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev), "suspending adapter()");
> + esas2r_log_dev(ESAS2R_LOG_INFO, dev, "suspending adapter()");
> if (!a)
> return -ENODEV;
>
> esas2r_adapter_power_down(a, 1);
> - device_state = pci_choose_state(pdev, state);
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> - "pci_save_state() called");
> - pci_save_state(pdev);
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> - "pci_disable_device() called");
> - pci_disable_device(pdev);
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> - "pci_set_power_state() called");
> - pci_set_power_state(pdev, device_state);
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev), "esas2r_suspend(): 0");
> + esas2r_log_dev(ESAS2R_LOG_INFO, dev, "esas2r_suspend(): 0");
> return 0;
> }
>
> -int esas2r_resume(struct pci_dev *pdev)
> +static int __maybe_unused esas2r_resume(struct device *dev)
> {
> - struct Scsi_Host *host = pci_get_drvdata(pdev);
> + struct Scsi_Host *host = dev_get_drvdata(dev);
> struct esas2r_adapter *a = (struct esas2r_adapter *)host->hostdata;
> - int rez;
> + int rez = 0;
>
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev), "resuming adapter()");
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> - "pci_set_power_state(PCI_D0) "
> + esas2r_log_dev(ESAS2R_LOG_INFO, dev, "resuming adapter()");
> + esas2r_log_dev(ESAS2R_LOG_INFO, dev,
> + "device_wakeup_disable() "
> "called");
> - pci_set_power_state(pdev, PCI_D0);
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> - "pci_enable_wake(PCI_D0, 0) "
> - "called");
> - pci_enable_wake(pdev, PCI_D0, 0);
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> - "pci_restore_state() called");
> - pci_restore_state(pdev);
> - esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> - "pci_enable_device() called");
> - rez = pci_enable_device(pdev);
> - pci_set_master(pdev);
> + device_wakeup_disable(dev);
>
> if (!a) {
> rez = -ENODEV;
> @@ -730,11 +708,13 @@ int esas2r_resume(struct pci_dev *pdev)
> }
>
> error_exit:
> - esas2r_log_dev(ESAS2R_LOG_CRIT, &(pdev->dev), "esas2r_resume(): %d",
> + esas2r_log_dev(ESAS2R_LOG_CRIT, dev, "esas2r_resume(): %d",
> rez);
> return rez;
> }
>
> +SIMPLE_DEV_PM_OPS(esas2r_pm_ops, esas2r_suspend, esas2r_resume);
> +
> bool esas2r_set_degraded_mode(struct esas2r_adapter *a, char *error_str)
> {
> set_bit(AF_DEGRADED_MODE, &a->flags);
> diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
> index 7b49e2e9fcde..aab3ea580e6b 100644
> --- a/drivers/scsi/esas2r/esas2r_main.c
> +++ b/drivers/scsi/esas2r/esas2r_main.c
> @@ -346,8 +346,7 @@ static struct pci_driver
> .id_table = esas2r_pci_table,
> .probe = esas2r_probe,
> .remove = esas2r_remove,
> - .suspend = esas2r_suspend,
> - .resume = esas2r_resume,
> + .driver.pm = &esas2r_pm_ops,
> };
>
> static int esas2r_probe(struct pci_dev *pcid,
> --
> 2.27.0
>
.
