diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index c9affefd79f6..75349cdaa84b 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include "atom.h" | 39 | #include "atom.h" |
40 | 40 | ||
41 | #include <linux/firmware.h> | 41 | #include <linux/firmware.h> |
42 | #include <linux/platform_device.h> | ||
43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
44 | 43 | ||
45 | #include "r100_reg_safe.h" | 44 | #include "r100_reg_safe.h" |
@@ -989,18 +988,11 @@ void r100_ring_start(struct radeon_device *rdev, struct radeon_ring *ring) | |||
989 | /* Load the microcode for the CP */ | 988 | /* Load the microcode for the CP */ |
990 | static int r100_cp_init_microcode(struct radeon_device *rdev) | 989 | static int r100_cp_init_microcode(struct radeon_device *rdev) |
991 | { | 990 | { |
992 | struct platform_device *pdev; | ||
993 | const char *fw_name = NULL; | 991 | const char *fw_name = NULL; |
994 | int err; | 992 | int err; |
995 | 993 | ||
996 | DRM_DEBUG_KMS("\n"); | 994 | DRM_DEBUG_KMS("\n"); |
997 | 995 | ||
998 | pdev = platform_device_register_simple("radeon_cp", 0, NULL, 0); | ||
999 | err = IS_ERR(pdev); | ||
1000 | if (err) { | ||
1001 | printk(KERN_ERR "radeon_cp: Failed to register firmware\n"); | ||
1002 | return -EINVAL; | ||
1003 | } | ||
1004 | if ((rdev->family == CHIP_R100) || (rdev->family == CHIP_RV100) || | 996 | if ((rdev->family == CHIP_R100) || (rdev->family == CHIP_RV100) || |
1005 | (rdev->family == CHIP_RV200) || (rdev->family == CHIP_RS100) || | 997 | (rdev->family == CHIP_RV200) || (rdev->family == CHIP_RS100) || |
1006 | (rdev->family == CHIP_RS200)) { | 998 | (rdev->family == CHIP_RS200)) { |
@@ -1042,8 +1034,7 @@ static int r100_cp_init_microcode(struct radeon_device *rdev) | |||
1042 | fw_name = FIRMWARE_R520; | 1034 | fw_name = FIRMWARE_R520; |
1043 | } | 1035 | } |
1044 | 1036 | ||
1045 | err = request_firmware(&rdev->me_fw, fw_name, &pdev->dev); | 1037 | err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); |
1046 | platform_device_unregister(pdev); | ||
1047 | if (err) { | 1038 | if (err) { |
1048 | printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n", | 1039 | printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n", |
1049 | fw_name); | 1040 | fw_name); |