| Message ID | CAOMZO5A_M3u4A3j7pFcooZ6jVi5LikERM4CVjL4bB2z5YVeTXQ@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 06, 2013 at 10:35:52PM -0300, Fabio Estevam wrote: > On Tue, Aug 6, 2013 at 12:49 PM, Mark Brown <broonie@kernel.org> wrote: > > From: Andy Green <andy.green@linaro.org> > > > > You might have CONFIG_PM, but you might not have CONFIG_SUSPEND, in which > > case these are unused. > > > > Signed-off-by: Andy Green <andy.green@linaro.org> > > Signed-off-by: Mark Brown <broonie@linaro.org> > What about doing this instead? Makes sense to me - Andy?
On 7 August 2013 17:34, Mark Brown <broonie@kernel.org> wrote: > On Tue, Aug 06, 2013 at 10:35:52PM -0300, Fabio Estevam wrote: >> On Tue, Aug 6, 2013 at 12:49 PM, Mark Brown <broonie@kernel.org> wrote: >> > From: Andy Green <andy.green@linaro.org> >> > >> > You might have CONFIG_PM, but you might not have CONFIG_SUSPEND, in which >> > case these are unused. >> > >> > Signed-off-by: Andy Green <andy.green@linaro.org> >> > Signed-off-by: Mark Brown <broonie@linaro.org> > >> What about doing this instead? > > Makes sense to me - Andy? Sure, it seems a much more complete solution. -Andy -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Aug 07, 2013 at 06:01:00PM +0800, Andy Green wrote: > On 7 August 2013 17:34, Mark Brown <broonie@kernel.org> wrote: > > On Tue, Aug 06, 2013 at 10:35:52PM -0300, Fabio Estevam wrote: > >> On Tue, Aug 6, 2013 at 12:49 PM, Mark Brown <broonie@kernel.org> wrote: > >> > From: Andy Green <andy.green@linaro.org> > >> > > >> > You might have CONFIG_PM, but you might not have CONFIG_SUSPEND, in which > >> > case these are unused. > >> > > >> > Signed-off-by: Andy Green <andy.green@linaro.org> > >> > Signed-off-by: Mark Brown <broonie@linaro.org> > > > >> What about doing this instead? > > > > Makes sense to me - Andy? > > Sure, it seems a much more complete solution. looks good to me too, please send it as a real patch (if you already have, sorry about that, catching up with my inbox now).
On Fri, Aug 9, 2013 at 10:26 AM, Felipe Balbi <balbi@ti.com> wrote: > looks good to me too, please send it as a real patch (if you already > have, sorry about that, catching up with my inbox now). Yes, I have already sent it as a formal patch. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -191,7 +191,7 @@ static DEFINE_PCI_DEVICE_TABLE(dwc3_pci_id_table) = { }; MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table); -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int dwc3_pci_suspend(struct device *dev) { struct pci_dev *pci = to_pci_dev(dev); @@ -216,15 +216,10 @@ static int dwc3_pci_resume(struct device *dev) return 0; } +#endif /* CONFIG_PM_SLEEP */ -static const struct dev_pm_ops dwc3_pci_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(dwc3_pci_suspend, dwc3_pci_resume) -}; - -#define DEV_PM_OPS (&dwc3_pci_dev_pm_ops) -#else -#define DEV_PM_OPS NULL -#endif /* CONFIG_PM */ +static SIMPLE_DEV_PM_OPS(dwc3_pci_dev_pm_ops, dwc3_pci_suspend, + dwc3_pci_resume); static struct pci_driver dwc3_pci_driver = { .name = "dwc3-pci", @@ -232,7 +227,7 @@ static struct pci_driver dwc3_pci_driver = { .probe = dwc3_pci_probe, .remove = dwc3_pci_remove, .driver = { - .pm = DEV_PM_OPS, + .pm = &dwc3_pci_dev_pm_ops, }, }; -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in