From patchwork Wed Dec 11 10:34:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3323851 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 568D5C0D4A for ; Wed, 11 Dec 2013 10:35:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C214120726 for ; Wed, 11 Dec 2013 10:35:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 97E8D20748 for ; Wed, 11 Dec 2013 10:35:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81FA8FB587; Wed, 11 Dec 2013 02:34:55 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by gabe.freedesktop.org (Postfix) with ESMTP id B88F7FAA25 for ; Wed, 11 Dec 2013 02:34:36 -0800 (PST) Received: by mail-ea0-f171.google.com with SMTP id h10so2815481eak.30 for ; Wed, 11 Dec 2013 02:34:36 -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=M/iG2/mxsYT8oZHgfIwX105jDeo2WocYBBzP5PcYYcg=; b=BCbK81s74P9rR5iD94NshBQhV+r/CM7PClj7XzyAwTFTkM2Y42oyZ/GIHvl5YbY8jG kpelVf7KQkrZ3Dyrl2/r+OD0HBDQui+smi+mMiXJwHPbO5mDwaeZWSsY7B8o74d8CefC Ig7gQOh+JD7EQ6HziE3Z6t+4phIC4W5Zg8Lrw= 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=M/iG2/mxsYT8oZHgfIwX105jDeo2WocYBBzP5PcYYcg=; b=dwvuQQGac5WCbIZuiWUHxnCgfVFoMYMoXq42He4qOfEFrJuoTT0FsvGL/7+J31S7Kq 64dbQI2vpLwpxvrxZlpA8+XttVqgn7WUkl522M/4TelTkWqttXs5X/wcpw1DG9rq4J7Z ERKmw4F/hIDIqap8njs9Z4t+2pE8HeYqlxmT7kP/jHMkjN1ZZOrhiNWfK5cfnvdPJPwN iwqZus/GA6qdUjevRa56cDar0LG7PYY9NWY3sO3t7Z9gaRXHAthG7YMcY8hOWAe7tJk+ usc06ID4gufLPb5WHkQFvLtDY3n2OYBaWdR92Xcfqv2Ip4CoyJZMzmGGJsmZTD7siD3X CCiw== X-Gm-Message-State: ALoCoQnaGADBEVjrWSjmBglFQxdSjmNzfv/J6Xckby3p9HSx4StKVPH8uaH3NNyBPw8aUIOMkvPv X-Received: by 10.15.95.72 with SMTP id bc48mr884705eeb.49.1386758076132; Wed, 11 Dec 2013 02:34:36 -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.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2013 02:34:35 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/50] drm/omap: call drm_put_dev directly in ->remove Date: Wed, 11 Dec 2013 11:34:26 +0100 Message-Id: <1386758111-3446-6-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 Again omap already sets the driver data pointer to the drm_device. Also drop the driver unregister call, that should be (and already is) done in the module unload hook. Cc: Rob Clark Signed-off-by: Daniel Vetter --- drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index e7fa3cd96743..13f294aeaefd 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -665,9 +665,9 @@ static int pdev_probe(struct platform_device *device) static int pdev_remove(struct platform_device *device) { DBG(""); - drm_platform_exit(&omap_drm_driver, device); - platform_driver_unregister(&omap_dmm_driver); + drm_put_dev(platform_get_drvdata(device)); + return 0; }