usb: core: Change usb_create_sysfs_intf_files()' return type to void

The usb_create_sysfs_intf_files() function always returned zero even
if it failed to create sysfs fails.  Since this is a desired behaviour
there is no need to return return code at all.  This commit changes
function's return type (form int) to void.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 6781c369ce2db6c621e188b303bc7560cce47ee5..cf05b97693ea8ff7a0534a76fcc226f10bb57e68 100644 (file)
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -842,22 +842,19 @@ const struct attribute_group *usb_interface_groups[] = {
        NULL
 };
 
-int usb_create_sysfs_intf_files(struct usb_interface *intf)
+void usb_create_sysfs_intf_files(struct usb_interface *intf)
 {
        struct usb_device *udev = interface_to_usbdev(intf);
        struct usb_host_interface *alt = intf->cur_altsetting;
-       int retval;
 
        if (intf->sysfs_files_created || intf->unregistering)
-               return 0;
+               return;
 
-       if (alt->string == NULL &&
-                       !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
+       if (!alt->string && !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
                alt->string = usb_cache_string(udev, alt->desc.iInterface);
-       if (alt->string)
-               retval = device_create_file(&intf->dev, &dev_attr_interface);
+       if (alt->string && device_create_file(&intf->dev, &dev_attr_interface))
+               ;       /* We don't actually care if the function fails. */
        intf->sysfs_files_created = 1;
-       return 0;
 }
 
 void usb_remove_sysfs_intf_files(struct usb_interface *intf)

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index d9d4b169404f9d46fbda9f5fa7cc09d00468d0a2..8706fc97e60f504783025b44ea1363a9623176b4 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -953,8 +953,7 @@ static int usb_bus_notify(struct notifier_block *nb, unsigned long action,
                if (dev->type == &usb_device_type)
                        (void) usb_create_sysfs_dev_files(to_usb_device(dev));
                else if (dev->type == &usb_if_device_type)
-                       (void) usb_create_sysfs_intf_files(
-                                       to_usb_interface(dev));
+                       usb_create_sysfs_intf_files(to_usb_interface(dev));
                break;
 
        case BUS_NOTIFY_DEL_DEVICE:

diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index d450b742137e45f4c9c728044ce394f578cac302..d44d4b7bbf17432d127594e01e55f200da76fb0d 100644 (file)
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -4,7 +4,7 @@
 
 extern int usb_create_sysfs_dev_files(struct usb_device *dev);
 extern void usb_remove_sysfs_dev_files(struct usb_device *dev);
-extern int usb_create_sysfs_intf_files(struct usb_interface *intf);
+extern void usb_create_sysfs_intf_files(struct usb_interface *intf);
 extern void usb_remove_sysfs_intf_files(struct usb_interface *intf);
 extern int usb_create_ep_devs(struct device *parent,
                                struct usb_host_endpoint *endpoint,