tools/intel_vbt_decode: clean up struct lvds_dvo_timing

For reasons unknown, we have two copies of the struct. Deduplicate.

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

2 files changed, 3 insertions, 22 deletions

diff --git a/tools/intel_bios.h b/tools/intel_bios.h
index c9980310..69d8aa6d 100644
--- a/tools/intel_bios.h
+++ b/tools/intel_bios.h
@@ -348,25 +348,6 @@ struct lvds_fp_timing {
 } __attribute__ ((packed));
 
 struct lvds_dvo_timing {
-	uint16_t dclk;		/**< In 10khz */
-	uint8_t hactive;
-	uint8_t hblank;
-	uint8_t high_h;		/**< 7:4 = hactive 11:8, 3:0 = hblank 11:8 */
-	uint8_t vactive;
-	uint8_t vblank;
-	uint8_t high_v;		/**< 7:4 = vactive 11:8, 3:0 = vblank 11:8 */
-	uint8_t hsync_off;
-	uint8_t hsync_pulse_width;
-	uint8_t vsync_off;
-	uint8_t high_hsync_off;	/**< 7:6 = hsync off 9:8 */
-	uint8_t h_image;
-	uint8_t v_image;
-	uint8_t max_hv;
-	uint8_t h_border;
-	uint8_t v_border;
-	uint8_t flags;
-} __attribute__ ((packed));
-struct lvds_dvo_timing2 {
 	uint16_t clock;		/**< In 10khz */
 	uint8_t hactive_lo;
 	uint8_t hblank_lo;
diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
index 2984a11e..0cf9183e 100644
--- a/tools/intel_vbt_decode.c
+++ b/tools/intel_vbt_decode.c
@@ -935,7 +935,7 @@ static void dump_psr(struct context *context,
 }
 
 static void
-print_detail_timing_data(const struct lvds_dvo_timing2 *dvo_timing)
+print_detail_timing_data(const struct lvds_dvo_timing *dvo_timing)
 {
 	int display, sync_start, sync_end, total;
 
@@ -966,10 +966,10 @@ print_detail_timing_data(const struct lvds_dvo_timing2 *dvo_timing)
 static void dump_sdvo_panel_dtds(struct context *context,
 				 const struct bdb_block *block)
 {
-	const struct lvds_dvo_timing2 *dvo_timing = block->data;
+	const struct lvds_dvo_timing *dvo_timing = block->data;
 	int n, count;
 
-	count = block->size / sizeof(struct lvds_dvo_timing2);
+	count = block->size / sizeof(struct lvds_dvo_timing);
 	for (n = 0; n < count; n++) {
 		printf("%d:\n", n);
 		print_detail_timing_data(dvo_timing++);