Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michal Nazarewicz and committed by
Greg Kroah-Hartman
643de624 869410f8

+7 -11
+5 -8
drivers/usb/core/sysfs.c
··· 842 842 NULL 843 843 }; 844 844 845 - int usb_create_sysfs_intf_files(struct usb_interface *intf) 845 + void usb_create_sysfs_intf_files(struct usb_interface *intf) 846 846 { 847 847 struct usb_device *udev = interface_to_usbdev(intf); 848 848 struct usb_host_interface *alt = intf->cur_altsetting; 849 - int retval; 850 849 851 850 if (intf->sysfs_files_created || intf->unregistering) 852 - return 0; 851 + return; 853 852 854 - if (alt->string == NULL && 855 - !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) 853 + if (!alt->string && !(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) 856 854 alt->string = usb_cache_string(udev, alt->desc.iInterface); 857 - if (alt->string) 858 - retval = device_create_file(&intf->dev, &dev_attr_interface); 855 + if (alt->string && device_create_file(&intf->dev, &dev_attr_interface)) 856 + ; /* We don't actually care if the function fails. */ 859 857 intf->sysfs_files_created = 1; 860 - return 0; 861 858 } 862 859 863 860 void usb_remove_sysfs_intf_files(struct usb_interface *intf)
+1 -2
drivers/usb/core/usb.c
··· 953 953 if (dev->type == &usb_device_type) 954 954 (void) usb_create_sysfs_dev_files(to_usb_device(dev)); 955 955 else if (dev->type == &usb_if_device_type) 956 - (void) usb_create_sysfs_intf_files( 957 - to_usb_interface(dev)); 956 + usb_create_sysfs_intf_files(to_usb_interface(dev)); 958 957 break; 959 958 960 959 case BUS_NOTIFY_DEL_DEVICE:
+1 -1
drivers/usb/core/usb.h
··· 4 4 5 5 extern int usb_create_sysfs_dev_files(struct usb_device *dev); 6 6 extern void usb_remove_sysfs_dev_files(struct usb_device *dev); 7 - extern int usb_create_sysfs_intf_files(struct usb_interface *intf); 7 + extern void usb_create_sysfs_intf_files(struct usb_interface *intf); 8 8 extern void usb_remove_sysfs_intf_files(struct usb_interface *intf); 9 9 extern int usb_create_ep_devs(struct device *parent, 10 10 struct usb_host_endpoint *endpoint,