]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
usb: gadget: configfs: use to_usb_function_instance() in cfg (un)link func
authorLinyu Yuan <quic_linyyuan@quicinc.com>
Thu, 18 Nov 2021 04:53:33 +0000 (12:53 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Nov 2021 13:12:48 +0000 (14:12 +0100)
replace open-coded container_of() with to_usb_function_instance() helper.

Reviewed-by: Jack Pham <quic_jackp@quicinc.com>
Signed-off-by: Linyu Yuan <quic_linyyuan@quicinc.com>
Link: https://lore.kernel.org/r/1637211213-16400-5-git-send-email-quic_linyyuan@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/configfs.c

index ff0fb33abb94dc3945714ca20c2464c25b2794e9..d4a678c0806e3418d6671f9b44fc344b47f49842 100644 (file)
@@ -416,9 +416,8 @@ static int config_usb_cfg_link(
        struct config_usb_cfg *cfg = to_config_usb_cfg(usb_cfg_ci);
        struct gadget_info *gi = cfg_to_gadget_info(cfg);
 
-       struct config_group *group = to_config_group(usb_func_ci);
-       struct usb_function_instance *fi = container_of(group,
-                       struct usb_function_instance, group);
+       struct usb_function_instance *fi =
+                       to_usb_function_instance(usb_func_ci);
        struct usb_function_instance *a_fi;
        struct usb_function *f;
        int ret;
@@ -466,9 +465,8 @@ static void config_usb_cfg_unlink(
        struct config_usb_cfg *cfg = to_config_usb_cfg(usb_cfg_ci);
        struct gadget_info *gi = cfg_to_gadget_info(cfg);
 
-       struct config_group *group = to_config_group(usb_func_ci);
-       struct usb_function_instance *fi = container_of(group,
-                       struct usb_function_instance, group);
+       struct usb_function_instance *fi =
+                       to_usb_function_instance(usb_func_ci);
        struct usb_function *f;
 
        /*