Commit 3c20d544 authored by Wambui Karuga's avatar Wambui Karuga Committed by Alex Deucher
Browse files

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: default avatarWambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fbd62354

drivers/gpu/drm/radeon/atombios_crtc.c

+1 −2
Original line number Diff line number Diff line
@@ -244,10 +244,9 @@ static void atombios_blank_crtc(struct drm_crtc *crtc, int state) 


	atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);



	if (ASIC_IS_DCE8(rdev)) {

	if (ASIC_IS_DCE8(rdev))

		WREG32(vga_control_regs[radeon_crtc->crtc_id], vga_control);

}

}



static void atombios_powergate_crtc(struct drm_crtc *crtc, int state)

{

drivers/gpu/drm/radeon/atombios_dp.c

+1 −2
Original line number Diff line number Diff line
@@ -813,10 +813,9 @@ void radeon_dp_link_train(struct drm_encoder *encoder, 
	dp_info.use_dpencoder = true;

	index = GetIndexIntoMasterTable(COMMAND, DPEncoderService);

	if (atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) {

		if (crev > 1) {

		if (crev > 1)

			dp_info.use_dpencoder = false;

	}

	}



	dp_info.enc_id = 0;

	if (dig->dig_encoder)

drivers/gpu/drm/radeon/atombios_encoders.c

+4 −5
Original line number Diff line number Diff line
@@ -1885,12 +1885,11 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder) 
			if (ASIC_IS_AVIVO(rdev))

				args.v1.ucCRTC = radeon_crtc->crtc_id;

			else {

				if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1) {

				if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1)

					args.v1.ucCRTC = radeon_crtc->crtc_id;

				} else {

				else

					args.v1.ucCRTC = radeon_crtc->crtc_id << 2;

			}

			}

			switch (radeon_encoder->encoder_id) {

			case ENCODER_OBJECT_ID_INTERNAL_TMDS1:

			case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
@@ -2234,9 +2233,9 @@ assigned: 
		DRM_ERROR("Got encoder index incorrect - returning 0\n");

		return 0;

	}

	if (rdev->mode_info.active_encoders & (1 << enc_idx)) {

	if (rdev->mode_info.active_encoders & (1 << enc_idx))

		DRM_ERROR("chosen encoder in use %d\n", enc_idx);

	}



	rdev->mode_info.active_encoders |= (1 << enc_idx);

	return enc_idx;

}

drivers/gpu/drm/radeon/radeon_connectors.c

+2 −2
Original line number Diff line number Diff line
@@ -700,9 +700,9 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct 
			else

				ret = radeon_legacy_get_tmds_info_from_combios(radeon_encoder, tmds);

		}

		if (val == 1 || !ret) {

		if (val == 1 || !ret)

			radeon_legacy_get_tmds_info_from_table(radeon_encoder, tmds);

		}



		radeon_property_change_mode(&radeon_encoder->base);

	}

drivers/gpu/drm/radeon/radeon_vce.c

+2 −2
Original line number Diff line number Diff line
@@ -388,9 +388,9 @@ int radeon_vce_get_create_msg(struct radeon_device *rdev, int ring, 
		ib.ptr[i] = cpu_to_le32(0x0);



	r = radeon_ib_schedule(rdev, &ib, NULL, false);

	if (r) {

	if (r)

		DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);

	}





	if (fence)

		*fence = radeon_fence_ref(ib.fence);

CRA Git | Maintained and supported by SUSTech CRA and CCSE