Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dd6c8bd authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie
Browse files

drm: Make drm_mode_attachmode() void 



drm_mode_attachmode() always returns 0. Change the return type to void.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1d97e915

drivers/gpu/drm/drm_crtc.c

+5 −11
Original line number Original line Diff line number Diff line
@@ -2379,21 +2379,17 @@ void drm_fb_release(struct drm_file *priv) 
 *

 *

 * Add @mode to @connector's user mode list.

 * Add @mode to @connector's user mode list.

 */

 */

static int drm_mode_attachmode(struct drm_device *dev,

static void drm_mode_attachmode(struct drm_device *dev,

				struct drm_connector *connector,

				struct drm_connector *connector,

				struct drm_display_mode *mode)

				struct drm_display_mode *mode)

{

{

	int ret = 0;



	list_add_tail(&mode->head, &connector->user_modes);

	list_add_tail(&mode->head, &connector->user_modes);

	return ret;

}

}





int drm_mode_attachmode_crtc(struct drm_device *dev, struct drm_crtc *crtc,

int drm_mode_attachmode_crtc(struct drm_device *dev, struct drm_crtc *crtc,

			     struct drm_display_mode *mode)

			     struct drm_display_mode *mode)

{

{

	struct drm_connector *connector;

	struct drm_connector *connector;

	int ret = 0;

	struct drm_display_mode *dup_mode;

	struct drm_display_mode *dup_mode;

	int need_dup = 0;

	int need_dup = 0;

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
@@ -2404,9 +2400,7 @@ int drm_mode_attachmode_crtc(struct drm_device *dev, struct drm_crtc *crtc, 
				dup_mode = drm_mode_duplicate(dev, mode);

				dup_mode = drm_mode_duplicate(dev, mode);

			else

			else

				dup_mode = mode;

				dup_mode = mode;

			ret = drm_mode_attachmode(dev, connector, dup_mode);

			drm_mode_attachmode(dev, connector, dup_mode);

			if (ret)

				return ret;

			need_dup = 1;

			need_dup = 1;

		}

		}

	}

	}
@@ -2491,7 +2485,7 @@ int drm_mode_attachmode_ioctl(struct drm_device *dev, 




	drm_crtc_convert_umode(mode, umode);

	drm_crtc_convert_umode(mode, umode);





	ret = drm_mode_attachmode(dev, connector, mode);

	drm_mode_attachmode(dev, connector, mode);

out:

out:

	mutex_unlock(&dev->mode_config.mutex);

	mutex_unlock(&dev->mode_config.mutex);

	return ret;

	return ret;