| Message ID | 20201029075430.228760-1-coiby.xu@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | Drivers: ssb: remove unnecessary CONFIG_PM_SLEEP | expand |
Coiby Xu <coiby.xu@gmail.com> writes: > SET_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG. > > Signed-off-by: Coiby Xu <coiby.xu@gmail.com> > --- > drivers/ssb/pcihost_wrapper.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c > index 410215c16920..6510f57469a0 100644 > --- a/drivers/ssb/pcihost_wrapper.c > +++ b/drivers/ssb/pcihost_wrapper.c > @@ -18,7 +18,6 @@ > #include <linux/ssb/ssb.h> > > > -#ifdef CONFIG_PM_SLEEP > static int ssb_pcihost_suspend(struct device *d) > { > struct pci_dev *dev = to_pci_dev(d); > @@ -62,8 +61,6 @@ static const struct dev_pm_ops ssb_pcihost_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(ssb_pcihost_suspend, ssb_pcihost_resume) > }; > > -#endif /* CONFIG_PM_SLEEP */ > - > static int ssb_pcihost_probe(struct pci_dev *dev, > const struct pci_device_id *id) > { > @@ -125,9 +122,7 @@ int ssb_pcihost_register(struct pci_driver *driver) > { > driver->probe = ssb_pcihost_probe; > driver->remove = ssb_pcihost_remove; > -#ifdef CONFIG_PM_SLEEP > driver->driver.pm = &ssb_pcihost_pm_ops; > -#endif > > return pci_register_driver(driver); > } I'm not convinced that this is correct. How have you confirmed that there are no compiler or sparse warnings?
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c index 410215c16920..6510f57469a0 100644 --- a/drivers/ssb/pcihost_wrapper.c +++ b/drivers/ssb/pcihost_wrapper.c @@ -18,7 +18,6 @@ #include <linux/ssb/ssb.h> -#ifdef CONFIG_PM_SLEEP static int ssb_pcihost_suspend(struct device *d) { struct pci_dev *dev = to_pci_dev(d); @@ -62,8 +61,6 @@ static const struct dev_pm_ops ssb_pcihost_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(ssb_pcihost_suspend, ssb_pcihost_resume) }; -#endif /* CONFIG_PM_SLEEP */ - static int ssb_pcihost_probe(struct pci_dev *dev, const struct pci_device_id *id) { @@ -125,9 +122,7 @@ int ssb_pcihost_register(struct pci_driver *driver) { driver->probe = ssb_pcihost_probe; driver->remove = ssb_pcihost_remove; -#ifdef CONFIG_PM_SLEEP driver->driver.pm = &ssb_pcihost_pm_ops; -#endif return pci_register_driver(driver); }
SET_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG. Signed-off-by: Coiby Xu <coiby.xu@gmail.com> --- drivers/ssb/pcihost_wrapper.c | 5 ----- 1 file changed, 5 deletions(-)