Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752054AbbFRFZF (ORCPT ); Thu, 18 Jun 2015 01:25:05 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:33499 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751319AbbFRFYz (ORCPT ); Thu, 18 Jun 2015 01:24:55 -0400 Date: Thu, 18 Jun 2015 07:27:39 +0200 From: Daniel Vetter To: Eddie Kovsky , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] Fixes: 9697dffb098d ("drm: Turn off Legacy Context Functions") Message-ID: <20150618052739.GF23637@phenom.ffwll.local> Mail-Followup-To: Eddie Kovsky , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20150617200347.GA4343@athena> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150617200347.GA4343@athena> X-Operating-System: Linux phenom 4.0.0-rc3+ User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4368 Lines: 114 On Wed, Jun 17, 2015 at 02:03:47PM -0600, Eddie Kovsky wrote: > Commit 9697dffb098d ("drm: Turn off Legacy Context Functions") > added checks for legacy features to several functions in the > drm driver. It is now possible for the void functions changed by > this commit to return an int error code. This patch updates > the function definitions to return int. This fixes the build warnings: > > warning: ‘return’ with a value, in function returning void > return -EINVAL > > Signed-off-by: Eddie Kovsky Oops sorry, I spotted this while applying but somehow screwed up and still pushed out the patch. Dropped it now for real. Thanks, Daniel > --- > 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_context.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 * dev, int ctx_handle) > mutex_lock(&dev->struct_mutex); > idr_remove(&dev->ctx_idr, ctx_handle); > mutex_unlock(&dev->struct_mutex); > + > + return 0; > } > > /** > @@ -107,7 +109,7 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev) > * 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; > } > > /** > @@ -127,7 +131,7 @@ void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev) > * @file. Note that after this call returns, new contexts might be added if > * the file is still alive. > */ > -void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file) > +int drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file) > { > struct drm_ctx_list *pos, *tmp; > > @@ -150,6 +154,8 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file) > } > > mutex_unlock(&dev->ctxlist_mutex); > + > + return 0; > } > > /*@}*/ > 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 > > 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_file *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); > > 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); > -- > 2.4.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/