drm/amdgpu: Convert driver sysfs attributes to static attributes

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_atombios.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
index 494b2e1..879ed3e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
@@ -1768,6 +1768,15 @@ static ssize_t amdgpu_atombios_get_vbios_version(struct device *dev,
 static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version,
                   NULL);
 
+static struct attribute *amdgpu_vbios_version_attrs[] = {
+       &dev_attr_vbios_version.attr,
+       NULL
+};
+
+const struct attribute_group amdgpu_vbios_version_attr_group = {
+       .attrs = amdgpu_vbios_version_attrs
+};
+
 /**
  * amdgpu_atombios_fini - free the driver info and callbacks for atombios
  *
@@ -1787,7 +1796,6 @@ void amdgpu_atombios_fini(struct amdgpu_device *adev)
        adev->mode_info.atom_context = NULL;
        kfree(adev->mode_info.atom_card_info);
        adev->mode_info.atom_card_info = NULL;
-       device_remove_file(adev->dev, &dev_attr_vbios_version);
 }
 
 /**
@@ -1804,7 +1812,6 @@ int amdgpu_atombios_init(struct amdgpu_device *adev)
 {
        struct card_info *atom_card_info =
            kzalloc(sizeof(struct card_info), GFP_KERNEL);
-       int ret;
 
        if (!atom_card_info)
                return -ENOMEM;
@@ -1833,12 +1840,6 @@ int amdgpu_atombios_init(struct amdgpu_device *adev)
                amdgpu_atombios_allocate_fb_scratch(adev);
        }
 
-       ret = device_create_file(adev->dev, &dev_attr_vbios_version);
-       if (ret) {
-               DRM_ERROR("Failed to create device file for VBIOS version\n");
-               return ret;
-       }
-
        return 0;
 }