2013-09-10 01:24:05

by Liu, Chuansheng

Subject: [PATCH] PCI/PM: Removing the function pci_pm_complete()

Commit(88d2613) removed the pm_runtime_put_sync() from pci_pm_complete()
to PM core code device_complete().

Here the pci_pm_complete() is doing the same work which can be done in
device_complete(), so we can remove it directly.

Signed-off-by: liu chuansheng <[email protected]>
---
drivers/pci/pci-driver.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 98f7b9b..736ef3f 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -599,18 +599,10 @@ static int pci_pm_prepare(struct device *dev)
return error;
}

-static void pci_pm_complete(struct device *dev)
-{
- struct device_driver *drv = dev->driver;
-
- if (drv && drv->pm && drv->pm->complete)
- drv->pm->complete(dev);
-}

#else /* !CONFIG_PM_SLEEP */

#define pci_pm_prepare NULL
-#define pci_pm_complete NULL

#endif /* !CONFIG_PM_SLEEP */

@@ -1123,7 +1115,6 @@ static int pci_pm_runtime_idle(struct device *dev)

const struct dev_pm_ops pci_dev_pm_ops = {
.prepare = pci_pm_prepare,
- .complete = pci_pm_complete,
.suspend = pci_pm_suspend,
.resume = pci_pm_resume,
.freeze = pci_pm_freeze,
--
1.7.0.4

2013-10-04 17:47:47

by Bjorn Helgaas

Subject: Re: [PATCH] PCI/PM: Removing the function pci_pm_complete()

On Tue, Sep 10, 2013 at 4:46 AM, Chuansheng Liu
<[email protected]> wrote:
>
> Commit(88d2613) removed the pm_runtime_put_sync() from pci_pm_complete()
> to PM core code device_complete().
>
> Here the pci_pm_complete() is doing the same work which can be done in
> device_complete(), so we can remove it directly.
>
> Signed-off-by: liu chuansheng <[email protected]>
> ---
> drivers/pci/pci-driver.c | 9 ---------
> 1 files changed, 0 insertions(+), 9 deletions(-)

This looks correct to me, but I'd like Rafael to ack it before I apply it.

> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 98f7b9b..736ef3f 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -599,18 +599,10 @@ static int pci_pm_prepare(struct device *dev)
> return error;
> }
>
> -static void pci_pm_complete(struct device *dev)
> -{
> - struct device_driver *drv = dev->driver;
> -
> - if (drv && drv->pm && drv->pm->complete)
> - drv->pm->complete(dev);
> -}
>
> #else /* !CONFIG_PM_SLEEP */
>
> #define pci_pm_prepare NULL
> -#define pci_pm_complete NULL
>
> #endif /* !CONFIG_PM_SLEEP */
>
> @@ -1123,7 +1115,6 @@ static int pci_pm_runtime_idle(struct device *dev)
>
> const struct dev_pm_ops pci_dev_pm_ops = {
> .prepare = pci_pm_prepare,
> - .complete = pci_pm_complete,
> .suspend = pci_pm_suspend,
> .resume = pci_pm_resume,
> .freeze = pci_pm_freeze,
> --
> 1.7.0.4
>
>
>

2013-10-05 22:36:04

by Rafael J. Wysocki

Subject: Re: [PATCH] PCI/PM: Removing the function pci_pm_complete()

On Friday, October 04, 2013 11:47:25 AM Bjorn Helgaas wrote:
> On Tue, Sep 10, 2013 at 4:46 AM, Chuansheng Liu
> <[email protected]> wrote:
> >
> > Commit(88d2613) removed the pm_runtime_put_sync() from pci_pm_complete()
> > to PM core code device_complete().
> >
> > Here the pci_pm_complete() is doing the same work which can be done in
> > device_complete(), so we can remove it directly.
> >
> > Signed-off-by: liu chuansheng <[email protected]>
> > ---
> > drivers/pci/pci-driver.c | 9 ---------
> > 1 files changed, 0 insertions(+), 9 deletions(-)
>
> This looks correct to me, but I'd like Rafael to ack it before I apply it.

Yes, it should work, so ACK.

Sorry for the delay.

> > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> > index 98f7b9b..736ef3f 100644
> > --- a/drivers/pci/pci-driver.c
> > +++ b/drivers/pci/pci-driver.c
> > @@ -599,18 +599,10 @@ static int pci_pm_prepare(struct device *dev)
> > return error;
> > }
> >
> > -static void pci_pm_complete(struct device *dev)
> > -{
> > - struct device_driver *drv = dev->driver;
> > -
> > - if (drv && drv->pm && drv->pm->complete)
> > - drv->pm->complete(dev);
> > -}
> >
> > #else /* !CONFIG_PM_SLEEP */
> >
> > #define pci_pm_prepare NULL
> > -#define pci_pm_complete NULL
> >
> > #endif /* !CONFIG_PM_SLEEP */
> >
> > @@ -1123,7 +1115,6 @@ static int pci_pm_runtime_idle(struct device *dev)
> >
> > const struct dev_pm_ops pci_dev_pm_ops = {
> > .prepare = pci_pm_prepare,
> > - .complete = pci_pm_complete,
> > .suspend = pci_pm_suspend,
> > .resume = pci_pm_resume,
> > .freeze = pci_pm_freeze,
> > --
> > 1.7.0.4

Thanks!

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

2013-10-07 21:33:42

by Bjorn Helgaas

Subject: Re: [PATCH] PCI/PM: Removing the function pci_pm_complete()

On Tue, Sep 10, 2013 at 4:46 AM, Chuansheng Liu
<[email protected]> wrote:
>
> Commit(88d2613) removed the pm_runtime_put_sync() from pci_pm_complete()
> to PM core code device_complete().
>
> Here the pci_pm_complete() is doing the same work which can be done in
> device_complete(), so we can remove it directly.
>
> Signed-off-by: liu chuansheng <[email protected]>

Applied to pci/misc with Rafaels' ack, for v3.13. Thanks!

Bjorn

> ---
> drivers/pci/pci-driver.c | 9 ---------
> 1 files changed, 0 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 98f7b9b..736ef3f 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -599,18 +599,10 @@ static int pci_pm_prepare(struct device *dev)
> return error;
> }
>
> -static void pci_pm_complete(struct device *dev)
> -{
> - struct device_driver *drv = dev->driver;
> -
> - if (drv && drv->pm && drv->pm->complete)
> - drv->pm->complete(dev);
> -}
>
> #else /* !CONFIG_PM_SLEEP */
>
> #define pci_pm_prepare NULL
> -#define pci_pm_complete NULL
>
> #endif /* !CONFIG_PM_SLEEP */
>
> @@ -1123,7 +1115,6 @@ static int pci_pm_runtime_idle(struct device *dev)
>
> const struct dev_pm_ops pci_dev_pm_ops = {
> .prepare = pci_pm_prepare,
> - .complete = pci_pm_complete,
> .suspend = pci_pm_suspend,
> .resume = pci_pm_resume,
> .freeze = pci_pm_freeze,
> --
> 1.7.0.4
>
>
>