hc
2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b
kernel/drivers/input/mouse/cyapa.c
....@@ -1238,13 +1238,6 @@
12381238 .attrs = cyapa_sysfs_entries,
12391239 };
12401240
1241
-static void cyapa_remove_sysfs_group(void *data)
1242
-{
1243
- struct cyapa *cyapa = data;
1244
-
1245
- sysfs_remove_group(&cyapa->client->dev.kobj, &cyapa_sysfs_group);
1246
-}
1247
-
12481241 static void cyapa_disable_regulator(void *data)
12491242 {
12501243 struct cyapa *cyapa = data;
....@@ -1312,16 +1305,9 @@
13121305 return error;
13131306 }
13141307
1315
- error = sysfs_create_group(&dev->kobj, &cyapa_sysfs_group);
1308
+ error = devm_device_add_group(dev, &cyapa_sysfs_group);
13161309 if (error) {
13171310 dev_err(dev, "failed to create sysfs entries: %d\n", error);
1318
- return error;
1319
- }
1320
-
1321
- error = devm_add_action(dev, cyapa_remove_sysfs_group, cyapa);
1322
- if (error) {
1323
- cyapa_remove_sysfs_group(cyapa);
1324
- dev_err(dev, "failed to add sysfs cleanup action: %d\n", error);
13251311 return error;
13261312 }
13271313