]> git.ipfire.org Git - people/ms/linux.git/commitdiff
usb: gadget: Drop unnecessary NULL checks after container_of
authorGuenter Roeck <linux@roeck-us.net>
Sat, 24 Apr 2021 14:54:43 +0000 (07:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 May 2021 09:16:10 +0000 (11:16 +0200)
The parameters passed to allow_link and drop_link functions are never NULL.
That means the result of container_of() on those parameters is also
never NULL, even though the reference into the structure points to the
first element of the structure. Remove the unnecessary NULL checks.

This change was made automatically with the following Coccinelle script.
A now obsolete 'out:' label was removed manually.

@@
type t;
identifier v;
statement s;
@@

<+...
(
  t v = container_of(...);
|
  v = container_of(...);
)
  ...
  when != v
- if (\( !v \| v == NULL \) ) s
...+>

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Felipe Balbi <balbi@kernel.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210424145443.170413-1-linux@roeck-us.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/function/uvc_configfs.c

index cd28dec837dd8236827ce859006d4b4d4690b98b..77d64031aa9c2ac83b0dfad99a76f54af8d39678 100644 (file)
@@ -914,8 +914,6 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
 
        target_fmt = container_of(to_config_group(target), struct uvcg_format,
                                  group);
-       if (!target_fmt)
-               goto out;
 
        uvcg_format_set_indices(to_config_group(target));
 
@@ -955,8 +953,6 @@ static void uvcg_streaming_header_drop_link(struct config_item *src,
        mutex_lock(&opts->lock);
        target_fmt = container_of(to_config_group(target), struct uvcg_format,
                                  group);
-       if (!target_fmt)
-               goto out;
 
        list_for_each_entry_safe(format_ptr, tmp, &src_hdr->formats, entry)
                if (format_ptr->fmt == target_fmt) {
@@ -968,7 +964,6 @@ static void uvcg_streaming_header_drop_link(struct config_item *src,
 
        --target_fmt->linked;
 
-out:
        mutex_unlock(&opts->lock);
        mutex_unlock(su_mutex);
 }