[PATCH v2 2/6] hvcs: Use dev_groups to manage hvcs device attributes

[Brian King]

Use the dev_groups functionality to manage the attribute groups
for hvcs devices. This simplifies the code and also eliminates
errors coming from kernfs when attempting to remove a console
device that is in use.

Signed-off-by: Brian King <brk...@linux.vnet.ibm.com>
---
 drivers/tty/hvc/hvcs.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index faf5ccfc561e..7f79444b4d89 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -432,7 +432,7 @@ static ssize_t hvcs_index_show(struct device *dev, struct 
device_attribute *attr
 
 static DEVICE_ATTR(index, S_IRUGO, hvcs_index_show, NULL);
 
-static struct attribute *hvcs_attrs[] = {
+static struct attribute *hvcs_dev_attrs[] = {
        &dev_attr_partner_vtys.attr,
        &dev_attr_partner_clcs.attr,
        &dev_attr_current_vty.attr,
@@ -441,8 +441,13 @@ static struct attribute *hvcs_attrs[] = {
        NULL,
 };
 
-static struct attribute_group hvcs_attr_group = {
-       .attrs = hvcs_attrs,
+static struct attribute_group hvcs_attr_dev_group = {
+       .attrs = hvcs_dev_attrs,
+};
+
+const static struct attribute_group *hvcs_attr_dev_groups[] = {
+       &hvcs_attr_dev_group,
+       NULL,
 };
 
 static ssize_t rescan_show(struct device_driver *ddp, char *buf)
@@ -688,8 +693,6 @@ static void hvcs_destruct_port(struct tty_port *p)
        spin_unlock_irqrestore(&hvcsd->lock, flags);
        spin_unlock(&hvcs_structs_lock);
 
-       sysfs_remove_group(&vdev->dev.kobj, &hvcs_attr_group);
-
        kfree(hvcsd);
 }
 
@@ -721,7 +724,6 @@ static int hvcs_probe(
 {
        struct hvcs_struct *hvcsd;
        int index, rc;
-       int retval;
 
        if (!dev || !id) {
                printk(KERN_ERR "HVCS: probed with invalid parameter.\n");
@@ -778,13 +780,6 @@ static int hvcs_probe(
        list_add_tail(&(hvcsd->next), &hvcs_structs);
        spin_unlock(&hvcs_structs_lock);
 
-       retval = sysfs_create_group(&dev->dev.kobj, &hvcs_attr_group);
-       if (retval) {
-               printk(KERN_ERR "HVCS: Can't create sysfs attrs for 
vty-server@%X\n",
-                      hvcsd->vdev->unit_address);
-               return retval;
-       }
-
        printk(KERN_INFO "HVCS: vty-server@%X added to the vio bus.\n", 
dev->unit_address);
 
        /*
@@ -831,6 +826,9 @@ static struct vio_driver hvcs_vio_driver = {
        .probe          = hvcs_probe,
        .remove         = hvcs_remove,
        .name           = hvcs_driver_name,
+       .driver = {
+               .dev_groups = hvcs_attr_dev_groups,
+       },
 };
 
 /* Only called from hvcs_get_pi please */
-- 
2.31.1