]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
USB: core: Replace an empty statement with a debug message
authorAlan Stern <stern@rowland.harvard.edu>
Wed, 22 Apr 2020 20:20:19 +0000 (16:20 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Apr 2020 13:28:13 +0000 (15:28 +0200)
This patch adds a dev_dbg() message to usb_create_sysfs_intf_files().
The message is not expected ever to appear; it's real purpose is to
satisfy the __must_check attribute on device_create_file() without
triggering a compiler warning about an empty statement.

In fact we don't really care if the sysfs attribute file doesn't get
created.  The interface string descriptor is purely informational and
hardly ever present.

Suggested-by: NeilBrown <neilb@suse.de>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/Pine.LNX.4.44L0.2004221618500.11262-100000@iolanthe.rowland.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/sysfs.c

index 9f4320b9d7fc00af99ee55b94b6917038f791992..a2ca38e25e0c33ab6a2c7aace36573068e3d9e36 100644 (file)
@@ -1262,8 +1262,10 @@ void usb_create_sysfs_intf_files(struct usb_interface *intf)
 
        if (!alt->string && !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
                alt->string = usb_cache_string(udev, alt->desc.iInterface);
-       if (alt->string && device_create_file(&intf->dev, &dev_attr_interface))
-               ;       /* We don't actually care if the function fails. */
+       if (alt->string && device_create_file(&intf->dev, &dev_attr_interface)) {
+               /* This is not a serious error */
+               dev_dbg(&intf->dev, "interface string descriptor file not created\n");
+       }
        intf->sysfs_files_created = 1;
 }