[PATCH 4/4] drm/i915/bios: return drm_edid_product_id from get_lvds_pnp_id()

[Jani Nikula]

Use a more suitable type to avoid the cast.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c 
b/drivers/gpu/drm/i915/display/intel_bios.c
index 5e111a8cce66..300c1acf5de2 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -595,7 +595,7 @@ get_lvds_fp_timing(const struct bdb_lvds_lfp_data *data,
        return (const void *)data + ptrs->ptr[index].fp_timing.offset;
 }
 
-static const struct lvds_pnp_id *
+static const struct drm_edid_product_id *
 get_lvds_pnp_id(const struct bdb_lvds_lfp_data *data,
                const struct bdb_lvds_lfp_data_ptrs *ptrs,
                int index)
@@ -679,7 +679,7 @@ static int pnpid_get_panel_type(struct drm_i915_private 
*i915,
                return -1;
 
        for (i = 0; i < 16; i++) {
-               const struct lvds_pnp_id *vbt_id =
+               const struct drm_edid_product_id *vbt_id =
                        get_lvds_pnp_id(data, ptrs, i);
 
                /* full match? */
@@ -877,7 +877,7 @@ parse_lfp_data(struct drm_i915_private *i915,
        const struct bdb_lvds_lfp_data *data;
        const struct bdb_lvds_lfp_data_tail *tail;
        const struct bdb_lvds_lfp_data_ptrs *ptrs;
-       const struct lvds_pnp_id *pnp_id;
+       const struct drm_edid_product_id *pnp_id;
        struct drm_printer p;
        int panel_type = panel->vbt.panel_type;
 
@@ -895,7 +895,7 @@ parse_lfp_data(struct drm_i915_private *i915,
        pnp_id = get_lvds_pnp_id(data, ptrs, panel_type);
 
        p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, "Panel");
-       drm_edid_print_product_id(&p, (const struct drm_edid_product_id 
*)pnp_id, false);
+       drm_edid_print_product_id(&p, pnp_id, false);
 
        tail = get_lfp_data_tail(data, ptrs);
        if (!tail)
-- 
2.39.2