From patchwork Wed Apr 14 10:16:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 92380 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3EAH1mI018258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 14 Apr 2010 10:17:39 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1O1zda-0007F0-VY; Wed, 14 Apr 2010 10:16:02 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.124] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1O1zdZ-0007Ev-8X for dri-devel@lists.sourceforge.net; Wed, 14 Apr 2010 10:16:01 +0000 X-ACL-Warn: Received: from cable-static-49-187.intergga.ch ([157.161.49.187] helo=localhost.localdomain) by sfi-mx-4.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1O1zdW-00060w-OU for dri-devel@lists.sourceforge.net; Wed, 14 Apr 2010 10:16:01 +0000 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.14.3/8.14.3) with ESMTP id o3EAGfs0021132; Wed, 14 Apr 2010 12:16:41 +0200 Received: (from daniel@localhost) by localhost.localdomain (8.14.3/8.14.3/Submit) id o3EAGfd4021131; Wed, 14 Apr 2010 12:16:41 +0200 From: Daniel Vetter To: dri-devel@lists.sourceforge.net Date: Wed, 14 Apr 2010 12:16:28 +0200 Message-Id: <1271240189-21087-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1271240189-21087-1-git-send-email-daniel.vetter@ffwll.ch> References: <1271240189-21087-1-git-send-email-daniel.vetter@ffwll.ch> X-Helo-Check: bad, None Existant Host/Domain (localhost.localdomain) X-Spam-Score: 11.5 (+++++++++++) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.8 HELO_LH_LD HELO_LH_LD 0.5 VA_HELO_CHECK Host Used Invalid or Forged HELO/EHLO 20 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL [157.161.49.187 listed in zen.spamhaus.org] -9.8 AWL AWL: From: address is in the auto white-list X-VA-Spam-Flag: YES X-Spam-Flag: YES X-Headers-End: 1O1zdW-00060w-OU Subject: [SPAM] [PATCH 2/3] drm: drop return value of drm_free_agp Cc: intel-gfx@lists.freedesktop.org, Daniel Vetter X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 14 Apr 2010 10:17:40 +0000 (UTC) diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c index e4865f9..84f0f52 100644 --- a/drivers/gpu/drm/drm_memory.c +++ b/drivers/gpu/drm/drm_memory.c @@ -106,9 +106,9 @@ DRM_AGP_MEM *drm_alloc_agp(struct drm_device * dev, int pages, u32 type) } /** Wrapper around agp_free_memory() */ -int drm_free_agp(DRM_AGP_MEM * handle, int pages) +void drm_free_agp(DRM_AGP_MEM * handle, int pages) { - return drm_agp_free_memory(handle) ? 0 : -EINVAL; + drm_agp_free_memory(handle); } EXPORT_SYMBOL(drm_free_agp); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 12ffa05..a32ed3c 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1160,8 +1160,8 @@ extern int drm_mem_info(char *buf, char **start, off_t offset, int request, int *eof, void *data); extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area); +extern void drm_free_agp(DRM_AGP_MEM * handle, int pages); extern DRM_AGP_MEM *drm_alloc_agp(struct drm_device *dev, int pages, u32 type); -extern int drm_free_agp(DRM_AGP_MEM * handle, int pages); extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start); extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev, struct page **pages,