Skip to contentSkip to conversation

drm/gma500: fix mode_valid's return type

PATCH New Luc Van Oostenryck 1 participant 1 message Apr 24, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/gma500: fix mode_valid's return type

The method struct drm_connector_helper_funcs::mode_valid is defined as returning an 'enum drm_mode_status' but the driver implementation for this method uses an 'int' for it.

Fix this by using 'enum drm_mode_status' in the driver too.

---
 drivers/gpu/drm/gma500/cdv_intel_crt.c    | 2 +-
 drivers/gpu/drm/gma500/cdv_intel_dp.c     | 2 +-
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c   | 2 +-
 drivers/gpu/drm/gma500/cdv_intel_lvds.c   | 2 +-
 drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +-
 drivers/gpu/drm/gma500/oaktrail_hdmi.c    | 2 +-
 drivers/gpu/drm/gma500/psb_intel_sdvo.c   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/gma500/cdv_intel_crt.c +1 -1
index b837e7a92..cb5a14b7e 100644
@@ -64,7 +64,7 @@ static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode)
 	REG_WRITE(reg, temp);
 }
 
-static int cdv_intel_crt_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status cdv_intel_crt_mode_valid(struct drm_connector *connector,
 				struct drm_display_mode *mode)
 {
 	if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
drivers/gpu/drm/gma500/cdv_intel_dp.c +1 -1
index a4bb89b78..5ea785f07 100644
@@ -505,7 +505,7 @@ static void cdv_intel_edp_backlight_off (struct gma_encoder *intel_encoder)
 	msleep(intel_dp->backlight_off_delay);
 }
 
-static int
+static enum drm_mode_status
 cdv_intel_dp_mode_valid(struct drm_connector *connector,
 		    struct drm_display_mode *mode)
 {
drivers/gpu/drm/gma500/cdv_intel_hdmi.c +1 -1
index 563f193fc..f08789985 100644
@@ -223,7 +223,7 @@ static int cdv_hdmi_get_modes(struct drm_connector *connector)
 	return ret;
 }
 
-static int cdv_hdmi_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status cdv_hdmi_mode_valid(struct drm_connector *connector,
 				 struct drm_display_mode *mode)
 {
 	if (mode->clock > 165000)
drivers/gpu/drm/gma500/cdv_intel_lvds.c +1 -1
index e64960db3..de9531caa 100644
@@ -244,7 +244,7 @@ static void cdv_intel_lvds_restore(struct drm_connector *connector)
 {
 }
 
-static int cdv_intel_lvds_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status cdv_intel_lvds_mode_valid(struct drm_connector *connector,
 			      struct drm_display_mode *mode)
 {
 	struct drm_device *dev = connector->dev;
drivers/gpu/drm/gma500/mdfld_dsi_output.c +1 -1
index acb3848ef..fe020926e 100644
@@ -346,7 +346,7 @@ static int mdfld_dsi_connector_get_modes(struct drm_connector *connector)
 	return 0;
 }
 
-static int mdfld_dsi_connector_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status mdfld_dsi_connector_mode_valid(struct drm_connector *connector,
 						struct drm_display_mode *mode)
 {
 	struct mdfld_dsi_connector *dsi_connector =
drivers/gpu/drm/gma500/oaktrail_hdmi.c +1 -1
index 8b2eb32ee..78566a80a 100644
@@ -509,7 +509,7 @@ static void oaktrail_hdmi_dpms(struct drm_encoder *encoder, int mode)
 	HDMI_WRITE(HDMI_VIDEO_REG, temp);
 }
 
-static int oaktrail_hdmi_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status oaktrail_hdmi_mode_valid(struct drm_connector *connector,
 				struct drm_display_mode *mode)
 {
 	if (mode->clock > 165000)
drivers/gpu/drm/gma500/psb_intel_sdvo.c +1 -1
index 84507912b..8dc2b19f9 100644
@@ -1157,7 +1157,7 @@ static void psb_intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
 	return;
 }
 
-static int psb_intel_sdvo_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status psb_intel_sdvo_mode_valid(struct drm_connector *connector,
 				 struct drm_display_mode *mode)
 {
 	struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);
Signature · 1 line
2.17.0