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

Commit 4f7ad521 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



After commit b2b49ccb (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under
drivers/scsi/ and in include/scsi/scsi_device.h.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarAaron Lu <aaron.lu@intel.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
parent 798bc6d8

drivers/scsi/scsi_pm.c

+0 −10
Original line number Diff line number Diff line
@@ -213,8 +213,6 @@ static int scsi_bus_restore(struct device *dev) 


#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_PM_RUNTIME



static int sdev_runtime_suspend(struct device *dev)

{

	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
@@ -332,14 +330,6 @@ void scsi_autopm_put_host(struct Scsi_Host *shost) 
	pm_runtime_put_sync(&shost->shost_gendev);

}



#else



#define scsi_runtime_suspend	NULL

#define scsi_runtime_resume	NULL

#define scsi_runtime_idle	NULL



#endif /* CONFIG_PM_RUNTIME */



const struct dev_pm_ops scsi_bus_pm_ops = {

	.prepare =		scsi_bus_prepare,

	.suspend =		scsi_bus_suspend,

drivers/scsi/scsi_priv.h

+2 −3
Original line number Diff line number Diff line
@@ -155,8 +155,7 @@ static inline void scsi_netlink_exit(void) {} 
/* scsi_pm.c */

#ifdef CONFIG_PM

extern const struct dev_pm_ops scsi_bus_pm_ops;

#endif

#ifdef CONFIG_PM_RUNTIME



extern void scsi_autopm_get_target(struct scsi_target *);

extern void scsi_autopm_put_target(struct scsi_target *);

extern int scsi_autopm_get_host(struct Scsi_Host *);
@@ -166,7 +165,7 @@ static inline void scsi_autopm_get_target(struct scsi_target *t) {} 
static inline void scsi_autopm_put_target(struct scsi_target *t) {}

static inline int scsi_autopm_get_host(struct Scsi_Host *h) { return 0; }

static inline void scsi_autopm_put_host(struct Scsi_Host *h) {}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



extern struct async_domain scsi_sd_pm_domain;

extern struct async_domain scsi_sd_probe_domain;

drivers/scsi/ufs/ufshcd-pci.c

+4 −7
Original line number Diff line number Diff line
@@ -62,12 +62,7 @@ static int ufshcd_pci_resume(struct device *dev) 
{

	return ufshcd_system_resume(dev_get_drvdata(dev));

}

#else

#define ufshcd_pci_suspend	NULL

#define ufshcd_pci_resume	NULL

#endif /* CONFIG_PM */



#ifdef CONFIG_PM_RUNTIME

static int ufshcd_pci_runtime_suspend(struct device *dev)

{

	return ufshcd_runtime_suspend(dev_get_drvdata(dev));
@@ -80,11 +75,13 @@ static int ufshcd_pci_runtime_idle(struct device *dev) 
{

	return ufshcd_runtime_idle(dev_get_drvdata(dev));

}

#else /* !CONFIG_PM_RUNTIME */

#else /* !CONFIG_PM */

#define ufshcd_pci_suspend	NULL

#define ufshcd_pci_resume	NULL

#define ufshcd_pci_runtime_suspend	NULL

#define ufshcd_pci_runtime_resume	NULL

#define ufshcd_pci_runtime_idle	NULL

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



/**

 * ufshcd_pci_shutdown - main function to put the controller in reset state

drivers/scsi/ufs/ufshcd-pltfrm.c

+4 −7
Original line number Diff line number Diff line
@@ -261,12 +261,7 @@ static int ufshcd_pltfrm_resume(struct device *dev) 
{

	return ufshcd_system_resume(dev_get_drvdata(dev));

}

#else

#define ufshcd_pltfrm_suspend	NULL

#define ufshcd_pltfrm_resume	NULL

#endif



#ifdef CONFIG_PM_RUNTIME

static int ufshcd_pltfrm_runtime_suspend(struct device *dev)

{

	return ufshcd_runtime_suspend(dev_get_drvdata(dev));
@@ -279,11 +274,13 @@ static int ufshcd_pltfrm_runtime_idle(struct device *dev) 
{

	return ufshcd_runtime_idle(dev_get_drvdata(dev));

}

#else /* !CONFIG_PM_RUNTIME */

#else /* !CONFIG_PM */

#define ufshcd_pltfrm_suspend	NULL

#define ufshcd_pltfrm_resume	NULL

#define ufshcd_pltfrm_runtime_suspend	NULL

#define ufshcd_pltfrm_runtime_resume	NULL

#define ufshcd_pltfrm_runtime_idle	NULL

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static void ufshcd_pltfrm_shutdown(struct platform_device *pdev)

{

include/scsi/scsi_device.h

+2 −2
Original line number Diff line number Diff line
@@ -441,13 +441,13 @@ static inline int scsi_execute_req(struct scsi_device *sdev, 
extern void sdev_disable_disk_events(struct scsi_device *sdev);

extern void sdev_enable_disk_events(struct scsi_device *sdev);



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

extern int scsi_autopm_get_device(struct scsi_device *);

extern void scsi_autopm_put_device(struct scsi_device *);

#else

static inline int scsi_autopm_get_device(struct scsi_device *d) { return 0; }

static inline void scsi_autopm_put_device(struct scsi_device *d) {}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)

{