aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorWolfram Sang <wsa-dev@sang-engineering.com>2016-08-09 07:30:30 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-08-10 14:09:50 -0400
commit88afb9e6cd3c3266abe9632dd99c60ca0581d8dc (patch)
treeb3a85018b28d56c239d8e535cba78c3485b8fcbb /drivers/gpu
parente7b26d12cd44cff6ad25db7896ed4c2e1f1848ae (diff)
gpu: drm: radeon: radeon_i2c: don't print error when adding adapter fails
The core will do this for us now. Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon_i2c.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index 9590bcd321c0..021aa005623f 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -938,10 +938,8 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
938 "Radeon i2c hw bus %s", name); 938 "Radeon i2c hw bus %s", name);
939 i2c->adapter.algo = &radeon_i2c_algo; 939 i2c->adapter.algo = &radeon_i2c_algo;
940 ret = i2c_add_adapter(&i2c->adapter); 940 ret = i2c_add_adapter(&i2c->adapter);
941 if (ret) { 941 if (ret)
942 DRM_ERROR("Failed to register hw i2c %s\n", name);
943 goto out_free; 942 goto out_free;
944 }
945 } else if (rec->hw_capable && 943 } else if (rec->hw_capable &&
946 radeon_hw_i2c && 944 radeon_hw_i2c &&
947 ASIC_IS_DCE3(rdev)) { 945 ASIC_IS_DCE3(rdev)) {
@@ -950,10 +948,8 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
950 "Radeon i2c hw bus %s", name); 948 "Radeon i2c hw bus %s", name);
951 i2c->adapter.algo = &radeon_atom_i2c_algo; 949 i2c->adapter.algo = &radeon_atom_i2c_algo;
952 ret = i2c_add_adapter(&i2c->adapter); 950 ret = i2c_add_adapter(&i2c->adapter);
953 if (ret) { 951 if (ret)
954 DRM_ERROR("Failed to register hw i2c %s\n", name);
955 goto out_free; 952 goto out_free;
956 }
957 } else { 953 } else {
958 /* set the radeon bit adapter */ 954 /* set the radeon bit adapter */
959 snprintf(i2c->adapter.name, sizeof(i2c->adapter.name), 955 snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),