ARM: OMAP2: Use custom soc attribute group instead of device_create_file

[linux-2.6-microblaze.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 37ac2d1..1d119b9 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -783,9 +783,15 @@ type_show(struct device *dev, struct device_attribute *attr, char *buf)
 
 static DEVICE_ATTR_RO(type);
 
+static struct attribute *omap_soc_attrs[] = {
+       &dev_attr_type.attr,
+       NULL
+};
+
+ATTRIBUTE_GROUPS(omap_soc);
+
 void __init omap_soc_device_init(void)
 {
-       struct device *parent;
        struct soc_device *soc_dev;
        struct soc_device_attribute *soc_dev_attr;
 
@@ -796,14 +802,12 @@ void __init omap_soc_device_init(void)
        soc_dev_attr->machine  = soc_name;
        soc_dev_attr->family   = omap_get_family();
        soc_dev_attr->revision = soc_rev;
+       soc_dev_attr->custom_attr_group = omap_soc_groups[0];
 
        soc_dev = soc_device_register(soc_dev_attr);
        if (IS_ERR(soc_dev)) {
                kfree(soc_dev_attr);
                return;
        }
-
-       parent = soc_device_to_device(soc_dev);
-       device_create_file(parent, &dev_attr_type);
 }
 #endif /* CONFIG_SOC_BUS */