Commit a1f763fe authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jani Nikula
Browse files

drm/i915/dsi: Get rid of redundant 'else' 



In the snippets like the following

	if (...)
		return / goto / break / continue ...;
	else
		...

the 'else' is redundant. Get rid of it.

Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231103201831.1037416-8-andriy.shevchenko@linux.intel.com
parent 1c8953b2

drivers/gpu/drm/i915/display/intel_dsi_vbt.c

+27 −29
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static enum port intel_dsi_seq_port_to_port(struct intel_dsi *intel_dsi, 
	if (seq_port) {

		if (intel_dsi->ports & BIT(PORT_B))

			return PORT_B;

		else if (intel_dsi->ports & BIT(PORT_C))

		if (intel_dsi->ports & BIT(PORT_C))

			return PORT_C;

	}
@@ -670,7 +670,7 @@ static const char *sequence_name(enum mipi_seq seq_id) 
{

	if (seq_id < ARRAY_SIZE(seq_name) && seq_name[seq_id])

		return seq_name[seq_id];

	else



	return "(unknown)";

}
@@ -865,36 +865,34 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id) 
	 * multiply by 100 to preserve remainder

	 */

	if (intel_dsi->video_mode == BURST_MODE) {

		if (mipi_config->target_burst_mode_freq) {

			u32 bitrate = intel_dsi_bitrate(intel_dsi);

		u32 bitrate;



		if (mipi_config->target_burst_mode_freq == 0) {

			drm_err(&dev_priv->drm, "Burst mode target is not set\n");

			return false;

		}



		bitrate = intel_dsi_bitrate(intel_dsi);



		/*

			 * Sometimes the VBT contains a slightly lower clock,

			 * then the bitrate we have calculated, in this case

			 * just replace it with the calculated bitrate.

		 * Sometimes the VBT contains a slightly lower clock, then

		 * the bitrate we have calculated, in this case just replace it

		 * with the calculated bitrate.

		 */

		if (mipi_config->target_burst_mode_freq < bitrate &&

			    intel_fuzzy_clock_check(

					mipi_config->target_burst_mode_freq,

		    intel_fuzzy_clock_check(mipi_config->target_burst_mode_freq,

					    bitrate))

			mipi_config->target_burst_mode_freq = bitrate;



		if (mipi_config->target_burst_mode_freq < bitrate) {

				drm_err(&dev_priv->drm,

					"Burst mode freq is less than computed\n");

			drm_err(&dev_priv->drm, "Burst mode freq is less than computed\n");

			return false;

		}



			burst_mode_ratio = DIV_ROUND_UP(

				mipi_config->target_burst_mode_freq * 100,

				bitrate);

		burst_mode_ratio =

			DIV_ROUND_UP(mipi_config->target_burst_mode_freq * 100, bitrate);



		intel_dsi->pclk = DIV_ROUND_UP(intel_dsi->pclk * burst_mode_ratio, 100);

		} else {

			drm_err(&dev_priv->drm,

				"Burst mode target is not set\n");

			return false;

		}

	} else

		burst_mode_ratio = 100;