HID: vivaldi: convert to use dev_groups

There is no need for a driver to individually add/create device groups,
the driver core will do it automatically for you.  Convert the
hid-vivaldi core driver to use the dev_groups pointer instead of
manually calling the driver core to create the group and have it be
cleaned up later on by the devm core.

Cc: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: linux-input@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index ff40f1e55c217bf9d37cd685f9df5033112f526a..7ae5f27df54dd6731b1dcef653a6153323cdbfc2 100644 (file)
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -608,9 +608,11 @@ static struct hid_driver hammer_driver = {
        .probe = hammer_probe,
        .remove = hammer_remove,
        .feature_mapping = vivaldi_feature_mapping,
-       .input_configured = vivaldi_input_configured,
        .input_mapping = hammer_input_mapping,
        .event = hammer_event,
+       .driver = {
+               .dev_groups = vivaldi_attribute_groups,
+       },
 };
 
 static int __init hammer_init(void)

diff --git a/drivers/hid/hid-vivaldi-common.c b/drivers/hid/hid-vivaldi-common.c
index 8b3e515d0f06d7ee32627ffd1e8472504d28c6cf..b0af2be948952c645222f04cbec2d70d7a326032 100644 (file)
--- a/drivers/hid/hid-vivaldi-common.c
+++ b/drivers/hid/hid-vivaldi-common.c
@@ -116,25 +116,26 @@ static struct attribute *vivaldi_sysfs_attrs[] = {
        NULL
 };
 
-static const struct attribute_group vivaldi_attribute_group = {
-       .attrs = vivaldi_sysfs_attrs,
-};
-
-/**
- * vivaldi_input_configured - Complete initialization of device using vivaldi map
- * @hdev: HID device to which vivaldi attributes should be attached
- * @hidinput: HID input device (unused)
- */
-int vivaldi_input_configured(struct hid_device *hdev,
-                            struct hid_input *hidinput)
+static umode_t vivaldi_is_visible(struct kobject *kobj, struct attribute *attr,
+                                 int n)
 {
+       struct hid_device *hdev = to_hid_device(kobj_to_dev(kobj));
        struct vivaldi_data *data = hid_get_drvdata(hdev);
 
        if (!data->num_function_row_keys)
                return 0;
-
-       return devm_device_add_group(&hdev->dev, &vivaldi_attribute_group);
+       return attr->mode;
 }
-EXPORT_SYMBOL_GPL(vivaldi_input_configured);
+
+static const struct attribute_group vivaldi_attribute_group = {
+       .attrs = vivaldi_sysfs_attrs,
+       .is_visible = vivaldi_is_visible,
+};
+
+const struct attribute_group *vivaldi_attribute_groups[] = {
+       &vivaldi_attribute_group,
+       NULL,
+};
+EXPORT_SYMBOL_GPL(vivaldi_attribute_groups);
 
 MODULE_LICENSE("GPL");

diff --git a/drivers/hid/hid-vivaldi-common.h b/drivers/hid/hid-vivaldi-common.h
index d42e82d77825b7db46b343bae58f0d5fae141f83..ba9adfa08a2d787dba5989c1f2d0f936ba5783ca 100644 (file)
--- a/drivers/hid/hid-vivaldi-common.h
+++ b/drivers/hid/hid-vivaldi-common.h
@@ -4,13 +4,11 @@
 
 struct hid_device;
 struct hid_field;
-struct hid_input;
 struct hid_usage;
 
 void vivaldi_feature_mapping(struct hid_device *hdev,
                             struct hid_field *field, struct hid_usage *usage);
 
-int vivaldi_input_configured(struct hid_device *hdev,
-                            struct hid_input *hidinput);
+extern const struct attribute_group *vivaldi_attribute_groups[];
 
 #endif /* _HID_VIVALDI_COMMON_H */

diff --git a/drivers/hid/hid-vivaldi.c b/drivers/hid/hid-vivaldi.c
index 3a979123e7d33f072be079425bbcfc9a619d92a2..cda5938fb07060be3ba5d38f43710886382dcdd8 100644 (file)
--- a/drivers/hid/hid-vivaldi.c
+++ b/drivers/hid/hid-vivaldi.c
@@ -45,7 +45,9 @@ static struct hid_driver hid_vivaldi = {
        .id_table = vivaldi_table,
        .probe = vivaldi_probe,
        .feature_mapping = vivaldi_feature_mapping,
-       .input_configured = vivaldi_input_configured,
+       .driver = {
+               .dev_groups = vivaldi_attribute_groups,
+       },
 };
 
 module_hid_driver(hid_vivaldi);