@@ -771,7 +771,7 @@ static DEVICE_ATTR(show_icon , _M220, NULL , show_icon );
771
771
static DEVICE_ATTR (hide_icon , _M220 , NULL , hide_icon ) ;
772
772
static DEVICE_ATTR (ringtone , _M220 , NULL , store_ringtone ) ;
773
773
774
- static struct attribute * yld_attributes [] = {
774
+ static struct attribute * yld_attrs [] = {
775
775
& dev_attr_line1 .attr ,
776
776
& dev_attr_line2 .attr ,
777
777
& dev_attr_line3 .attr ,
@@ -782,10 +782,7 @@ static struct attribute *yld_attributes[] = {
782
782
& dev_attr_ringtone .attr ,
783
783
NULL
784
784
};
785
-
786
- static const struct attribute_group yld_attr_group = {
787
- .attrs = yld_attributes
788
- };
785
+ ATTRIBUTE_GROUPS (yld );
789
786
790
787
/*******************************************************************************
791
788
* Linux interface and usb initialisation
@@ -842,7 +839,6 @@ static void usb_disconnect(struct usb_interface *intf)
842
839
843
840
down_write (& sysfs_rwsema );
844
841
yld = usb_get_intfdata (intf );
845
- sysfs_remove_group (& intf -> dev .kobj , & yld_attr_group );
846
842
usb_set_intfdata (intf , NULL );
847
843
up_write (& sysfs_rwsema );
848
844
@@ -975,8 +971,6 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
975
971
store_line3 (& intf -> dev , NULL ,
976
972
DRIVER_VERSION , sizeof (DRIVER_VERSION ));
977
973
978
- /* Register sysfs hooks (don't care about failure) */
979
- ret = sysfs_create_group (& intf -> dev .kobj , & yld_attr_group );
980
974
return 0 ;
981
975
}
982
976
@@ -985,6 +979,7 @@ static struct usb_driver yealink_driver = {
985
979
.probe = usb_probe ,
986
980
.disconnect = usb_disconnect ,
987
981
.id_table = usb_table ,
982
+ .dev_groups = yld_groups ,
988
983
};
989
984
990
985
module_usb_driver (yealink_driver );
0 commit comments