Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/radeon: remove unnecessary braces around conditionals.

As single statement conditionals do not need to be wrapped around
braces, the unnecessary braces can be removed.

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Wambui Karuga and committed by
Alex Deucher
3c20d544 fbd62354

+18 -21
+1 -2
drivers/gpu/drm/radeon/atombios_crtc.c
··· 244 244 245 245 atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); 246 246 247 - if (ASIC_IS_DCE8(rdev)) { 247 + if (ASIC_IS_DCE8(rdev)) 248 248 WREG32(vga_control_regs[radeon_crtc->crtc_id], vga_control); 249 - } 250 249 } 251 250 252 251 static void atombios_powergate_crtc(struct drm_crtc *crtc, int state)
+1 -2
drivers/gpu/drm/radeon/atombios_dp.c
··· 813 813 dp_info.use_dpencoder = true; 814 814 index = GetIndexIntoMasterTable(COMMAND, DPEncoderService); 815 815 if (atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) { 816 - if (crev > 1) { 816 + if (crev > 1) 817 817 dp_info.use_dpencoder = false; 818 - } 819 818 } 820 819 821 820 dp_info.enc_id = 0;
+4 -5
drivers/gpu/drm/radeon/atombios_encoders.c
··· 1885 1885 if (ASIC_IS_AVIVO(rdev)) 1886 1886 args.v1.ucCRTC = radeon_crtc->crtc_id; 1887 1887 else { 1888 - if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1) { 1888 + if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1) 1889 1889 args.v1.ucCRTC = radeon_crtc->crtc_id; 1890 - } else { 1890 + else 1891 1891 args.v1.ucCRTC = radeon_crtc->crtc_id << 2; 1892 - } 1893 1892 } 1894 1893 switch (radeon_encoder->encoder_id) { 1895 1894 case ENCODER_OBJECT_ID_INTERNAL_TMDS1: ··· 2233 2234 DRM_ERROR("Got encoder index incorrect - returning 0\n"); 2234 2235 return 0; 2235 2236 } 2236 - if (rdev->mode_info.active_encoders & (1 << enc_idx)) { 2237 + if (rdev->mode_info.active_encoders & (1 << enc_idx)) 2237 2238 DRM_ERROR("chosen encoder in use %d\n", enc_idx); 2238 - } 2239 + 2239 2240 rdev->mode_info.active_encoders |= (1 << enc_idx); 2240 2241 return enc_idx; 2241 2242 }
+2 -2
drivers/gpu/drm/radeon/radeon_connectors.c
··· 700 700 else 701 701 ret = radeon_legacy_get_tmds_info_from_combios(radeon_encoder, tmds); 702 702 } 703 - if (val == 1 || !ret) { 703 + if (val == 1 || !ret) 704 704 radeon_legacy_get_tmds_info_from_table(radeon_encoder, tmds); 705 - } 705 + 706 706 radeon_property_change_mode(&radeon_encoder->base); 707 707 } 708 708
+2 -2
drivers/gpu/drm/radeon/radeon_vce.c
··· 388 388 ib.ptr[i] = cpu_to_le32(0x0); 389 389 390 390 r = radeon_ib_schedule(rdev, &ib, NULL, false); 391 - if (r) { 391 + if (r) 392 392 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r); 393 - } 393 + 394 394 395 395 if (fence) 396 396 *fence = radeon_fence_ref(ib.fence);
+8 -8
drivers/gpu/drm/radeon/radeon_vm.c
··· 296 296 struct radeon_bo_va *bo_va; 297 297 298 298 list_for_each_entry(bo_va, &bo->va, bo_list) { 299 - if (bo_va->vm == vm) { 299 + if (bo_va->vm == vm) 300 300 return bo_va; 301 - } 301 + 302 302 } 303 303 return NULL; 304 304 } ··· 323 323 struct radeon_bo_va *bo_va; 324 324 325 325 bo_va = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL); 326 - if (bo_va == NULL) { 326 + if (bo_va == NULL) 327 327 return NULL; 328 - } 328 + 329 329 bo_va->vm = vm; 330 330 bo_va->bo = bo; 331 331 bo_va->it.start = 0; ··· 947 947 948 948 if (mem) { 949 949 addr = (u64)mem->start << PAGE_SHIFT; 950 - if (mem->mem_type != TTM_PL_SYSTEM) { 950 + if (mem->mem_type != TTM_PL_SYSTEM) 951 951 bo_va->flags |= RADEON_VM_PAGE_VALID; 952 - } 952 + 953 953 if (mem->mem_type == TTM_PL_TT) { 954 954 bo_va->flags |= RADEON_VM_PAGE_SYSTEM; 955 955 if (!(bo_va->bo->flags & (RADEON_GEM_GTT_WC | RADEON_GEM_GTT_UC))) ··· 1233 1233 struct radeon_bo_va *bo_va, *tmp; 1234 1234 int i, r; 1235 1235 1236 - if (!RB_EMPTY_ROOT(&vm->va.rb_root)) { 1236 + if (!RB_EMPTY_ROOT(&vm->va.rb_root)) 1237 1237 dev_err(rdev->dev, "still active bo inside vm\n"); 1238 - } 1238 + 1239 1239 rbtree_postorder_for_each_entry_safe(bo_va, tmp, 1240 1240 &vm->va.rb_root, it.rb) { 1241 1241 interval_tree_remove(&bo_va->it, &vm->va);