Commit c99e3ac6 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: atkbd - switch to using dev_groups for driver-specific attributes 



The driver core now has the ability to handle the creation and removal
of device-specific sysfs files, let's use it instead of registering and
unregistering attributes by hand.

Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20220903051119.1332808-1-dmitry.torokhov@gmail.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent ed3d5bd2

drivers/input/keyboard/atkbd.c

+6 −10
Original line number Diff line number Diff line
@@ -323,11 +323,13 @@ static umode_t atkbd_attr_is_visible(struct kobject *kobj, 
	return attr->mode;

}



static struct attribute_group atkbd_attribute_group = {

static const struct attribute_group atkbd_attribute_group = {

	.attrs	= atkbd_attributes,

	.is_visible = atkbd_attr_is_visible,

};



__ATTRIBUTE_GROUPS(atkbd_attribute);



static const unsigned int xl_table[] = {

	ATKBD_RET_BAT, ATKBD_RET_ERR, ATKBD_RET_ACK,

	ATKBD_RET_NAK, ATKBD_RET_HANJA, ATKBD_RET_HANGEUL,
@@ -922,8 +924,6 @@ static void atkbd_disconnect(struct serio *serio) 
{

	struct atkbd *atkbd = serio_get_drvdata(serio);



	sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group);



	atkbd_disable(atkbd);



	input_unregister_device(atkbd->dev);
@@ -1271,21 +1271,16 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv) 
	atkbd_set_keycode_table(atkbd);

	atkbd_set_device_attrs(atkbd);



	err = sysfs_create_group(&serio->dev.kobj, &atkbd_attribute_group);

	if (err)

		goto fail3;



	atkbd_enable(atkbd);

	if (serio->write)

		atkbd_activate(atkbd);



	err = input_register_device(atkbd->dev);

	if (err)

		goto fail4;

		goto fail3;



	return 0;



 fail4: sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group);

 fail3:	serio_close(serio);

 fail2:	serio_set_drvdata(serio, NULL);

 fail1:	input_free_device(dev);
@@ -1379,6 +1374,7 @@ MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 
static struct serio_driver atkbd_drv = {

	.driver		= {

		.name		= "atkbd",

		.dev_groups	= atkbd_attribute_groups,

	},

	.description	= DRIVER_DESC,

	.id_table	= atkbd_serio_ids,