On Wed, Aug 7, 2013 at 7:51 PM, Fabio Estevam <festevam@xxxxxxxxx> wrote:
> From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
>
> Using SIMPLE_DEV_PM_OPS can make the code simpler and cleaner.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
> ---
> drivers/usb/dwc3/dwc3-pci.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> index 5d746e5..b922315 100644
> --- 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,
> },
> };
It seems .pm is not NULL if CONFIG_PM_SLEEP is not defined
which is not the same with former code.
--
BR,
Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
