]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
usb: cdns3: rename hibernated argument of role->resume() to lost_power
authorThéo Lebrun <theo.lebrun@bootlin.com>
Wed, 5 Feb 2025 17:36:48 +0000 (18:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Mar 2025 08:18:02 +0000 (09:18 +0100)
The cdns_role_driver->resume() callback takes a second boolean argument
named `hibernated` in its implementations. This is mistaken; the only
potential caller is:

int cdns_resume(struct cdns *cdns)
{
/* ... */

if (cdns->roles[cdns->role]->resume)
cdns->roles[cdns->role]->resume(cdns, cdns_power_is_lost(cdns));

return 0;
}

The argument can be true in cases outside of return from hibernation.
Reflect the true meaning by renaming both arguments to `lost_power`.

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Acked-by: Peter Chen <peter.chen@kernel.org>
Link: https://lore.kernel.org/r/20250205-s2r-cdns-v7-3-13658a271c3c@bootlin.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/cdns3/cdns3-gadget.c
drivers/usb/cdns3/cdnsp-gadget.c
drivers/usb/cdns3/core.h

index fd1beb10bba726cef258e7438d642f31d6567dfe..694aa14577390b6e9a98ce8c4685ac8f56e43ad4 100644 (file)
@@ -3468,7 +3468,7 @@ __must_hold(&cdns->lock)
        return 0;
 }
 
-static int cdns3_gadget_resume(struct cdns *cdns, bool hibernated)
+static int cdns3_gadget_resume(struct cdns *cdns, bool lost_power)
 {
        struct cdns3_device *priv_dev = cdns->gadget_dev;
 
@@ -3476,7 +3476,7 @@ static int cdns3_gadget_resume(struct cdns *cdns, bool hibernated)
                return 0;
 
        cdns3_gadget_config(priv_dev);
-       if (hibernated)
+       if (lost_power)
                writel(USB_CONF_DEVEN, &priv_dev->regs->usb_conf);
 
        return 0;
index 97edf767ecee9067e3db66c2373d4b1a7a2e29de..87f310841735092b6209ba6cbb9b56afa963e84c 100644 (file)
@@ -1974,7 +1974,7 @@ static int cdnsp_gadget_suspend(struct cdns *cdns, bool do_wakeup)
        return 0;
 }
 
-static int cdnsp_gadget_resume(struct cdns *cdns, bool hibernated)
+static int cdnsp_gadget_resume(struct cdns *cdns, bool lost_power)
 {
        struct cdnsp_device *pdev = cdns->gadget_dev;
        enum usb_device_speed max_speed;
index 57d47348dc193b1060f4543c2ef22905f464293b..921cccf1ca9db27a66b06c7c7873b13537c74b05 100644 (file)
@@ -30,7 +30,7 @@ struct cdns_role_driver {
        int (*start)(struct cdns *cdns);
        void (*stop)(struct cdns *cdns);
        int (*suspend)(struct cdns *cdns, bool do_wakeup);
-       int (*resume)(struct cdns *cdns, bool hibernated);
+       int (*resume)(struct cdns *cdns, bool lost_power);
        const char *name;
 #define CDNS_ROLE_STATE_INACTIVE       0
 #define CDNS_ROLE_STATE_ACTIVE         1