From patchwork Wed Dec 11 10:34:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3323821 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 11F979F37A for ; Wed, 11 Dec 2013 10:35:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A95520729 for ; Wed, 11 Dec 2013 10:35:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C7602206C3 for ; Wed, 11 Dec 2013 10:34:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F8A1FB4D0; Wed, 11 Dec 2013 02:34:51 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f48.google.com (mail-ee0-f48.google.com [74.125.83.48]) by gabe.freedesktop.org (Postfix) with ESMTP id BBCB4FB457 for ; Wed, 11 Dec 2013 02:34:47 -0800 (PST) Received: by mail-ee0-f48.google.com with SMTP id e49so2787651eek.7 for ; Wed, 11 Dec 2013 02:34:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oN5/7KmT7/NOI2XEOzuL32KSNg0b+c9IRNrHa74Aazs=; b=ANFkxrSQMloZ8QeO2S+3tp9hEu1QGUScUUEq3eW6Ea+K/sLV/OVsAN9GOJOxbshs4i CnSd3pfkmwhhJcVob+7PV/7pTy1dvHrf4WQXQOUC6mEp+INvMEuYDAkrY3VEoCZqr/0y 66hYFRoGlG/DcL22tT1otKi0uDrCsdymJqt8w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oN5/7KmT7/NOI2XEOzuL32KSNg0b+c9IRNrHa74Aazs=; b=I7K8j1TGL8snptESVi/K4jUazE0iGHMrg+LB3XA2ctBPqwtpCy6BZ9KD0M2/sCGGo8 GBtESSJF6dWs2P6sM8Gvl0vsOIHSWc2+d3oM+ubGPRHbHT6RtIPehGFLdafkclIACMZl JjxWwJZfcOJRSqGhhycW5StA0wKdN1RPOQzIwjY5unp3QGp4vrGwUdr1XQcVfBbXZIpF lJK+I85/ROyGp8vS49sEF9v+zhat5QTzs+Wgjq21E7YeevA8PU3Z8/A/NWxM04TqAuXG 5R627v+ljQBq6bNWoBW9IIt9WF5IQY9AjNpqAzKxd7a+ckQelH39OCPUuDOVZB2QsgJ6 T0dg== X-Gm-Message-State: ALoCoQklyjVpReBcSjRizQrbDaUXxPSZw3TfSpuH/SO5vfYxNZSmYIPBjsGZSx77G0yu2tJCqLs8 X-Received: by 10.14.105.7 with SMTP id j7mr805224eeg.95.1386758087158; Wed, 11 Dec 2013 02:34:47 -0800 (PST) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id b41sm51932269eef.16.2013.12.11.02.34.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2013 02:34:46 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 13/50] drm: ->agp_init can't fail Date: Wed, 11 Dec 2013 11:34:34 +0100 Message-Id: <1386758111-3446-14-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386758111-3446-1-git-send-email-daniel.vetter@ffwll.ch> References: <1386758111-3446-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Thanks to the removal of REQUIRE_AGP we can use a void return value and shed a bit of complexity. Reviewed-by: David Herrmann Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_pci.c | 3 +-- drivers/gpu/drm/drm_stub.c | 7 ++----- include/drm/drmP.h | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index c99c71b3d220..d3875e3f9d9c 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -262,7 +262,7 @@ static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p) return 0; } -static int drm_pci_agp_init(struct drm_device *dev) +static void drm_pci_agp_init(struct drm_device *dev) { if (drm_core_has_AGP(dev)) { if (drm_pci_device_is_agp(dev)) @@ -274,7 +274,6 @@ static int drm_pci_agp_init(struct drm_device *dev) 1024 * 1024); } } - return 0; } static void drm_pci_agp_destroy(struct drm_device *dev) diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 4c57da81c141..085eb84a380c 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -521,11 +521,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) mutex_lock(&drm_global_mutex); - if (dev->driver->bus->agp_init) { - ret = dev->driver->bus->agp_init(dev); - if (ret) - goto out_unlock; - } + if (dev->driver->bus->agp_init) + dev->driver->bus->agp_init(dev); if (drm_core_check_feature(dev, DRIVER_MODESET)) { ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index e4eb653ac4cd..9b53031d04ed 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -750,7 +750,7 @@ struct drm_bus { struct drm_unique *unique); int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p); /* hooks that are for PCI */ - int (*agp_init)(struct drm_device *dev); + void (*agp_init)(struct drm_device *dev); void (*agp_destroy)(struct drm_device *dev); };