From: Eddie Kovsky Subject: [PATCH] Fixes: 9697dffb098d ("drm: Turn off Legacy Context Functions") Date: Wed, 17 Jun 2015 14:03:47 -0600 Message-ID: <20150617200347.GA4343@athena> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org To: David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org Commit 9697dffb098d ("drm: Turn off Legacy Context Functions") added checks for legacy features to several functions in the=20 drm driver. It is now possible for the void functions changed by=20 this commit to return an int error code. This patch updates the function definitions to return int. This fixes the build warnings: warning: =E2=80=98return=E2=80=99 with a value, in function returning v= oid return -EINVAL Signed-off-by: Eddie Kovsky --- drivers/gpu/drm/drm_context.c | 12 +++++++++--- drivers/gpu/drm/drm_legacy.h | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_contex= t.c index f3ea657f6574..3c2f4a76f934 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c @@ -51,7 +51,7 @@ struct drm_ctx_list { * in drm_device::ctx_idr, while holding the drm_device::struct_mutex * lock. */ -void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle= ) +int drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle) { if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && drm_core_check_feature(dev, DRIVER_MODESET)) @@ -60,6 +60,8 @@ void drm_legacy_ctxbitmap_free(struct drm_device * de= v, int ctx_handle) mutex_lock(&dev->struct_mutex); idr_remove(&dev->ctx_idr, ctx_handle); mutex_unlock(&dev->struct_mutex); + + return 0; } =20 /** @@ -107,7 +109,7 @@ int drm_legacy_ctxbitmap_init(struct drm_device * d= ev) * Free all idr members using drm_ctx_sarea_free helper function * while holding the drm_device::struct_mutex lock. */ -void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev) +int drm_legacy_ctxbitmap_cleanup(struct drm_device * dev) { if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && drm_core_check_feature(dev, DRIVER_MODESET)) @@ -116,6 +118,8 @@ void drm_legacy_ctxbitmap_cleanup(struct drm_device= * dev) mutex_lock(&dev->struct_mutex); idr_destroy(&dev->ctx_idr); mutex_unlock(&dev->struct_mutex); + + return 0; } =20 /** @@ -127,7 +131,7 @@ void drm_legacy_ctxbitmap_cleanup(struct drm_device= * dev) * @file. Note that after this call returns, new contexts might be add= ed if * the file is still alive. */ -void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_fil= e *file) +int drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file= *file) { struct drm_ctx_list *pos, *tmp; =20 @@ -150,6 +154,8 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *= dev, struct drm_file *file) } =20 mutex_unlock(&dev->ctxlist_mutex); + + return 0; } =20 /*@}*/ diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.= h index c1dc61473db5..26c16220e475 100644 --- a/drivers/gpu/drm/drm_legacy.h +++ b/drivers/gpu/drm/drm_legacy.h @@ -43,9 +43,9 @@ struct drm_file; #define DRM_RESERVED_CONTEXTS 1 =20 int drm_legacy_ctxbitmap_init(struct drm_device *dev); -void drm_legacy_ctxbitmap_cleanup(struct drm_device *dev); -void drm_legacy_ctxbitmap_free(struct drm_device *dev, int ctx_handle)= ; -void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_fil= e *file); +int drm_legacy_ctxbitmap_cleanup(struct drm_device *dev); +int drm_legacy_ctxbitmap_free(struct drm_device *dev, int ctx_handle); +int drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file= *file); =20 int drm_legacy_resctx(struct drm_device *d, void *v, struct drm_file *= f); int drm_legacy_addctx(struct drm_device *d, void *v, struct drm_file *= f); --=20 2.4.3