hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mips: sgi-ip22: ecard: 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: Ralf Baechle <ralf@linux-mips.org>
Cc: <linux-mips@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2017-06-06 14:16:30 +02:00
parent 71d1e5d71c
commit 136e882fcc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/mips/sgi-ip22/ip22-gio.c
View File

@ -169,6 +169,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
} }
static DEVICE_ATTR_RO(modalias);
static ssize_t name_show(struct device *dev, static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
@ -178,6 +179,7 @@ static ssize_t name_show(struct device *dev,
giodev = to_gio_device(dev); giodev = to_gio_device(dev);
return sprintf(buf, "%s", giodev->name); return sprintf(buf, "%s", giodev->name);
} }
static DEVICE_ATTR_RO(name);
static ssize_t id_show(struct device *dev, static ssize_t id_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
@ -187,13 +189,15 @@ static ssize_t id_show(struct device *dev,
giodev = to_gio_device(dev); giodev = to_gio_device(dev);
return sprintf(buf, "%x", giodev->id.id); return sprintf(buf, "%x", giodev->id.id);
} }
static DEVICE_ATTR_RO(id);
static struct device_attribute gio_dev_attrs[] = { static struct attribute *gio_dev_attrs[] = {
__ATTR_RO(modalias), &dev_attr_modalias.attr,
__ATTR_RO(name), &dev_attr_name.attr,
__ATTR_RO(id), &dev_attr_id.attr,
__ATTR_NULL, NULL,
}; };
ATTRIBUTE_GROUPS(gio_dev);
static int gio_device_uevent(struct device *dev, struct kobj_uevent_env *env) static int gio_device_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
@ -374,7 +378,7 @@ static void ip22_check_gio(int slotno, unsigned long addr, int irq)
static struct bus_type gio_bus_type = { static struct bus_type gio_bus_type = {
.name = "gio", .name = "gio",
.dev_attrs = gio_dev_attrs, .dev_groups = gio_dev_groups,
.match = gio_bus_match, .match = gio_bus_match,
.probe = gio_device_probe, .probe = gio_device_probe,
.remove = gio_device_remove, .remove = gio_device_remove,