@@ -710,6 +710,20 @@ static struct bin_attribute kone_profile5_attr = {
.write = kone_sysfs_write_profile5
};
+static struct attribute *kone_bin_attributes[] = {
+ &kone_settings_attr.attr,
+ &kone_profile1_attr.attr,
+ &kone_profile2_attr.attr,
+ &kone_profile3_attr.attr,
+ &kone_profile4_attr.attr,
+ &kone_profile5_attr.attr,
+ NULL
+};
+
+static struct attribute_group kone_bin_attribute_group = {
+ .attrs = kone_bin_attributes
+};
+
static int kone_create_sysfs_attributes(struct usb_interface *intf)
{
int retval;
@@ -718,42 +732,12 @@ static int kone_create_sysfs_attributes(struct usb_interface *intf)
if (retval)
goto exit_1;
- retval = sysfs_create_bin_file(&intf->dev.kobj, &kone_settings_attr);
+ retval = sysfs_create_bin_group(&intf->dev.kobj, &kone_bin_attribute_group);
if (retval)
goto exit_2;
- retval = sysfs_create_bin_file(&intf->dev.kobj, &kone_profile1_attr);
- if (retval)
- goto exit_3;
-
- retval = sysfs_create_bin_file(&intf->dev.kobj, &kone_profile2_attr);
- if (retval)
- goto exit_4;
-
- retval = sysfs_create_bin_file(&intf->dev.kobj, &kone_profile3_attr);
- if (retval)
- goto exit_5;
-
- retval = sysfs_create_bin_file(&intf->dev.kobj, &kone_profile4_attr);
- if (retval)
- goto exit_6;
-
- retval = sysfs_create_bin_file(&intf->dev.kobj, &kone_profile5_attr);
- if (retval)
- goto exit_7;
-
return 0;
-exit_7:
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile4_attr);
-exit_6:
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile3_attr);
-exit_5:
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile2_attr);
-exit_4:
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile1_attr);
-exit_3:
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_settings_attr);
exit_2:
sysfs_remove_group(&intf->dev.kobj, &kone_attribute_group);
exit_1:
@@ -762,12 +746,7 @@ exit_1:
static void kone_remove_sysfs_attributes(struct usb_interface *intf)
{
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile5_attr);
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile4_attr);
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile3_attr);
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile2_attr);
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_profile1_attr);
- sysfs_remove_bin_file(&intf->dev.kobj, &kone_settings_attr);
+ sysfs_remove_group(&intf->dev.kobj, &kone_bin_attribute_group);
sysfs_remove_group(&intf->dev.kobj, &kone_attribute_group);
}