Commit 4134069f authored by Takashi Iwai's avatar Takashi Iwai Committed by David S. Miller

hso: Use static attribute groups for sysfs entry

Pass the static attribute groups and the driver data via
tty_port_register_device_attr() instead of manual device_create_file()
and device_remove_file() calls.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0ebfaea
...@@ -531,6 +531,13 @@ static ssize_t hso_sysfs_show_porttype(struct device *dev, ...@@ -531,6 +531,13 @@ static ssize_t hso_sysfs_show_porttype(struct device *dev,
} }
static DEVICE_ATTR(hsotype, S_IRUGO, hso_sysfs_show_porttype, NULL); static DEVICE_ATTR(hsotype, S_IRUGO, hso_sysfs_show_porttype, NULL);
static struct attribute *hso_serial_dev_attrs[] = {
&dev_attr_hsotype.attr,
NULL
};
ATTRIBUTE_GROUPS(hso_serial_dev);
static int hso_urb_to_index(struct hso_serial *serial, struct urb *urb) static int hso_urb_to_index(struct hso_serial *serial, struct urb *urb)
{ {
int idx; int idx;
...@@ -2236,9 +2243,6 @@ static int hso_stop_serial_device(struct hso_device *hso_dev) ...@@ -2236,9 +2243,6 @@ static int hso_stop_serial_device(struct hso_device *hso_dev)
static void hso_serial_tty_unregister(struct hso_serial *serial) static void hso_serial_tty_unregister(struct hso_serial *serial)
{ {
if (serial->parent->dev)
device_remove_file(serial->parent->dev, &dev_attr_hsotype);
tty_unregister_device(tty_drv, serial->minor); tty_unregister_device(tty_drv, serial->minor);
} }
...@@ -2274,11 +2278,10 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs, ...@@ -2274,11 +2278,10 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
goto exit; goto exit;
/* register our minor number */ /* register our minor number */
serial->parent->dev = tty_port_register_device(&serial->port, tty_drv, serial->parent->dev = tty_port_register_device_attr(&serial->port,
minor, &serial->parent->interface->dev); tty_drv, minor, &serial->parent->interface->dev,
serial->parent, hso_serial_dev_groups);
dev = serial->parent->dev; dev = serial->parent->dev;
dev_set_drvdata(dev, serial->parent);
i = device_create_file(dev, &dev_attr_hsotype);
/* fill in specific data for later use */ /* fill in specific data for later use */
serial->minor = minor; serial->minor = minor;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment