|
@@ -400,16 +400,13 @@ static ssize_t chip_ngpio_show(struct device *dev,
|
|
|
}
|
|
|
static DEVICE_ATTR(ngpio, 0444, chip_ngpio_show, NULL);
|
|
|
|
|
|
-static const struct attribute *gpiochip_attrs[] = {
|
|
|
+static struct attribute *gpiochip_attrs[] = {
|
|
|
&dev_attr_base.attr,
|
|
|
&dev_attr_label.attr,
|
|
|
&dev_attr_ngpio.attr,
|
|
|
NULL,
|
|
|
};
|
|
|
-
|
|
|
-static const struct attribute_group gpiochip_attr_group = {
|
|
|
- .attrs = (struct attribute **) gpiochip_attrs,
|
|
|
-};
|
|
|
+ATTRIBUTE_GROUPS(gpiochip);
|
|
|
|
|
|
/*
|
|
|
* /sys/class/gpio/export ... write-only
|
|
@@ -750,13 +747,13 @@ int gpiochip_export(struct gpio_chip *chip)
|
|
|
|
|
|
/* use chip->base for the ID; it's already known to be unique */
|
|
|
mutex_lock(&sysfs_lock);
|
|
|
- dev = device_create(&gpio_class, chip->dev, MKDEV(0, 0), chip,
|
|
|
- "gpiochip%d", chip->base);
|
|
|
- if (!IS_ERR(dev)) {
|
|
|
- status = sysfs_create_group(&dev->kobj,
|
|
|
- &gpiochip_attr_group);
|
|
|
- } else
|
|
|
+ dev = device_create_with_groups(&gpio_class, chip->dev, MKDEV(0, 0),
|
|
|
+ chip, gpiochip_groups,
|
|
|
+ "gpiochip%d", chip->base);
|
|
|
+ if (IS_ERR(dev))
|
|
|
status = PTR_ERR(dev);
|
|
|
+ else
|
|
|
+ status = 0;
|
|
|
chip->exported = (status == 0);
|
|
|
mutex_unlock(&sysfs_lock);
|
|
|
|