Re: [PATCH 5/8] usb: phy: fsl: Use the new device_to_pm() helper to access struct dev_pm_ops

From
Rafael J. Wysocki <rafael@kernel.org>
Date
2020-05-26 08:39:12
Also in
linux-acpi, linux-pci, linux-pm, linux-s390, linux-scsi, linux-usb
Reply to
Krzysztof Wilczyński, 2020-05-25
On Mon, May 25, 2020 at 8:26 PM Krzysztof Wilczyński [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Use the new device_to_pm() helper to access Power Management callbacs
(struct dev_pm_ops) for a particular device (struct device_driver).

No functional change intended.

Signed-off-by: Krzysztof Wilczyński <redacted>
---
 drivers/usb/phy/phy-fsl-usb.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index b451f4695f3f..3b9ad5db8380 100644
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -460,6 +460,7 @@ int fsl_otg_start_host(struct otg_fsm *fsm, int on)
        struct device *dev;
        struct fsl_otg *otg_dev =
                container_of(otg->usb_phy, struct fsl_otg, phy);
+       const struct dev_pm_ops *pm;
        u32 retval = 0;

        if (!otg->host)
@@ -479,8 +480,9 @@ int fsl_otg_start_host(struct otg_fsm *fsm, int on)
                else {
                        otg_reset_controller();
                        VDBG("host on......\n");
-                       if (dev->driver->pm && dev->driver->pm->resume) {
-                               retval = dev->driver->pm->resume(dev);
+                       pm = driver_to_pm(dev->driver);
+                       if (pm && pm->resume) {
+                               retval = pm->resume(dev);
And why is the new version better this time?
quoted hunk ↗ jump to hunk
                                if (fsm->id) {
                                        /* default-b */
                                        fsl_otg_drv_vbus(fsm, 1);
@@ -504,8 +506,9 @@ int fsl_otg_start_host(struct otg_fsm *fsm, int on)
                else {
                        VDBG("host off......\n");
                        if (dev && dev->driver) {
-                               if (dev->driver->pm && dev->driver->pm->suspend)
-                                       retval = dev->driver->pm->suspend(dev);
+                               pm = driver_to_pm(dev->driver);
+                               if (pm && pm->suspend)
+                                       retval = pm->suspend(dev);
                                if (fsm->id)
                                        /* default-b */
                                        fsl_otg_drv_vbus(fsm, 0);
--
2.26.2
Thread (26 messages) 26 messages, 7 authors, last reply 2020-05-26
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help