Commit 34a3242b authored by Zhang Qilong's avatar Zhang Qilong Committed by Alex Deucher
Browse files

drm/amdgpu: Discard unnecessary breaks 



The 'break' is unnecessary because of previous
'return', discard it.

Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1b3c7564

drivers/gpu/drm/amd/amdgpu/atombios_encoders.c

+0 −6
Original line number Diff line number Diff line
@@ -499,10 +499,8 @@ int amdgpu_atombios_encoder_get_encoder_mode(struct drm_encoder *encoder) 
		} else {

			return ATOM_ENCODER_MODE_DVI;

		}

		break;

	case DRM_MODE_CONNECTOR_LVDS:

		return ATOM_ENCODER_MODE_LVDS;

		break;

	case DRM_MODE_CONNECTOR_DisplayPort:

		dig_connector = amdgpu_connector->con_priv;

		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
@@ -519,20 +517,16 @@ int amdgpu_atombios_encoder_get_encoder_mode(struct drm_encoder *encoder) 
		} else {

			return ATOM_ENCODER_MODE_DVI;

		}

		break;

	case DRM_MODE_CONNECTOR_eDP:

		return ATOM_ENCODER_MODE_DP;

	case DRM_MODE_CONNECTOR_DVIA:

	case DRM_MODE_CONNECTOR_VGA:

		return ATOM_ENCODER_MODE_CRT;

		break;

	case DRM_MODE_CONNECTOR_Composite:

	case DRM_MODE_CONNECTOR_SVIDEO:

	case DRM_MODE_CONNECTOR_9PinDIN:

		/* fix me */

		return ATOM_ENCODER_MODE_TV;

		/*return ATOM_ENCODER_MODE_CV;*/

		break;

	}

}

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+0 −4
Original line number Diff line number Diff line
@@ -2202,22 +2202,18 @@ static int dce_v10_0_pick_dig_encoder(struct drm_encoder *encoder) 
			return 1;

		else

			return 0;

		break;

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

		if (dig->linkb)

			return 3;

		else

			return 2;

		break;

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

		if (dig->linkb)

			return 5;

		else

			return 4;

		break;

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:

		return 6;

		break;

	default:

		DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);

		return 0;

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+0 −7
Original line number Diff line number Diff line
@@ -2235,22 +2235,18 @@ static int dce_v11_0_pick_dig_encoder(struct drm_encoder *encoder) 
			return 1;

		else

			return 0;

		break;

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

		if (dig->linkb)

			return 3;

		else

			return 2;

		break;

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

		if (dig->linkb)

			return 5;

		else

			return 4;

		break;

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:

		return 6;

		break;

	default:

		DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);

		return 0;
@@ -2304,19 +2300,16 @@ static u32 dce_v11_0_pick_pll(struct drm_crtc *crtc) 
				return ATOM_COMBOPHY_PLL1;

			else

				return ATOM_COMBOPHY_PLL0;

			break;

		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

			if (dig->linkb)

				return ATOM_COMBOPHY_PLL3;

			else

				return ATOM_COMBOPHY_PLL2;

			break;

		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

			if (dig->linkb)

				return ATOM_COMBOPHY_PLL5;

			else

				return ATOM_COMBOPHY_PLL4;

			break;

		default:

			DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);

			return ATOM_PPLL_INVALID;