macintosh: use dev_groups and not dev_attrs for bus_type
The dev_attrs field has long been "depreciated" and is finally being removed, so move the driver to use the "correct" dev_groups field instead for struct bus_type. Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: <linuxppc-dev@lists.ozlabs.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9f4ac349bd
commit
60bb70aa76
|
@ -133,7 +133,7 @@ static int macio_device_resume(struct device * dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern struct device_attribute macio_dev_attrs[];
|
extern const struct attribute_group *macio_dev_groups[];
|
||||||
|
|
||||||
struct bus_type macio_bus_type = {
|
struct bus_type macio_bus_type = {
|
||||||
.name = "macio",
|
.name = "macio",
|
||||||
|
@ -144,7 +144,7 @@ struct bus_type macio_bus_type = {
|
||||||
.shutdown = macio_device_shutdown,
|
.shutdown = macio_device_shutdown,
|
||||||
.suspend = macio_device_suspend,
|
.suspend = macio_device_suspend,
|
||||||
.resume = macio_device_resume,
|
.resume = macio_device_resume,
|
||||||
.dev_attrs = macio_dev_attrs,
|
.dev_groups = macio_dev_groups,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init macio_bus_driver_init(void)
|
static int __init macio_bus_driver_init(void)
|
||||||
|
|
|
@ -10,7 +10,8 @@ field##_show (struct device *dev, struct device_attribute *attr, \
|
||||||
{ \
|
{ \
|
||||||
struct macio_dev *mdev = to_macio_device (dev); \
|
struct macio_dev *mdev = to_macio_device (dev); \
|
||||||
return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
|
return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
|
||||||
}
|
} \
|
||||||
|
static DEVICE_ATTR_RO(field);
|
||||||
|
|
||||||
static ssize_t
|
static ssize_t
|
||||||
compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
|
compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
|
@ -37,6 +38,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
|
|
||||||
return length;
|
return length;
|
||||||
}
|
}
|
||||||
|
static DEVICE_ATTR_RO(compatible);
|
||||||
|
|
||||||
static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
|
static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
|
||||||
char *buf)
|
char *buf)
|
||||||
|
@ -52,15 +54,26 @@ static ssize_t devspec_show(struct device *dev,
|
||||||
ofdev = to_platform_device(dev);
|
ofdev = to_platform_device(dev);
|
||||||
return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
|
return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
|
||||||
}
|
}
|
||||||
|
static DEVICE_ATTR_RO(modalias);
|
||||||
|
static DEVICE_ATTR_RO(devspec);
|
||||||
|
|
||||||
macio_config_of_attr (name, "%s\n");
|
macio_config_of_attr (name, "%s\n");
|
||||||
macio_config_of_attr (type, "%s\n");
|
macio_config_of_attr (type, "%s\n");
|
||||||
|
|
||||||
struct device_attribute macio_dev_attrs[] = {
|
static struct attribute *macio_dev_attrs[] = {
|
||||||
__ATTR_RO(name),
|
&dev_attr_name.attr,
|
||||||
__ATTR_RO(type),
|
&dev_attr_type.attr,
|
||||||
__ATTR_RO(compatible),
|
&dev_attr_compatible.attr,
|
||||||
__ATTR_RO(modalias),
|
&dev_attr_modalias.attr,
|
||||||
__ATTR_RO(devspec),
|
&dev_attr_devspec.attr,
|
||||||
__ATTR_NULL
|
NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct attribute_group macio_dev_group = {
|
||||||
|
.attrs = macio_dev_attrs,
|
||||||
|
};
|
||||||
|
|
||||||
|
const struct attribute_group *macio_dev_groups[] = {
|
||||||
|
&macio_dev_group,
|
||||||
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue