From patchwork Wed May 24 14:52:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9746217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D648760209 for ; Wed, 24 May 2017 14:55:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9A402896F for ; Wed, 24 May 2017 14:55:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE44A2899A; Wed, 24 May 2017 14:55:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6A2252896F for ; Wed, 24 May 2017 14:55:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2253A6E7CF; Wed, 24 May 2017 14:53:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 473E96E7A1 for ; Wed, 24 May 2017 14:52:59 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id d127so47738058wmf.1 for ; Wed, 24 May 2017 07:52:59 -0700 (PDT) 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=MN2fp2Weh0uD0pp/0LBooRQprKLu+vDWkySx5aCz5zM=; b=bE7gR/eb9TaYw6qtgDGq2TBbyIyJyNwEE3KqN01Ozir2OhBTPQgEBValrKcise+GB4 iAleEi+BTjit0f16GZOMxnPK+rLuae5v/aBGg4XTmhzFzyK1zoNV7xkftb2PFjyKwpJy VIjGsSYUSeaN6RF94CakM4dibivllsROK9Cxg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MN2fp2Weh0uD0pp/0LBooRQprKLu+vDWkySx5aCz5zM=; b=LYizGtjsGRylC4Jb5OkI4cZy4HlbIAP51ZuTHTJCyJsXU0AK5tGK7K9Sui2WHQ2Lde 95ziFN7nC6Pb6W0jUFRDZLDr1MSjP65eM+IfA0nvUczmCgCp/vI0OrNpGEXlNMxpQHQY BPhvJMqbyZj/yVuCguHzEoqSP2ZUxrrYDLlsfACUeu7U7ACflTktg6q/u5xDRN3XxiJT 59G4zQSe3lcri8/WqfWBOhHnG3g7jQToRl2ul7N4+is5IwbJOZNGIM1joiR4k3K4B3bd ZbXRPLTcYaOs6yBaXyO6Q8GADBMtPafFev0tqzZvZgTcBviGI2AIBig1p9aPpKbg4PT6 RU7w== X-Gm-Message-State: AODbwcCHeMogb6k9YtEJ8O94ySKXWXMR3O13X1kZ3ZdLxclNrxrrdyYA WxDh8ybQSfUo/bR10e8= X-Received: by 10.80.150.38 with SMTP id y35mr25643709eda.79.1495637577749; Wed, 24 May 2017 07:52:57 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id m9sm1778858edm.62.2017.05.24.07.52.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 07:52:57 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Wed, 24 May 2017 16:52:04 +0200 Message-Id: <20170524145212.27837-30-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170524145212.27837-1-daniel.vetter@ffwll.ch> References: <20170524145212.27837-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Laurent Pinchart , Daniel Vetter Subject: [Intel-gfx] [PATCH 29/37] drm/shmob: Drop drm_vblank_cleanup X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP It doesn't do anything in the driver load error paths that the drm core doesn't also do. Cc: Laurent Pinchart Signed-off-by: Daniel Vetter --- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index 800d1d2c435d..c2ca07357aac 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -277,7 +277,7 @@ static int shmob_drm_probe(struct platform_device *pdev) ret = drm_irq_install(ddev, platform_get_irq(pdev, 0)); if (ret < 0) { dev_err(&pdev->dev, "failed to install IRQ handler\n"); - goto err_vblank_cleanup; + goto err_modeset_cleanup; } /* @@ -292,8 +292,6 @@ static int shmob_drm_probe(struct platform_device *pdev) err_irq_uninstall: drm_irq_uninstall(ddev); -err_vblank_cleanup: - drm_vblank_cleanup(ddev); err_modeset_cleanup: drm_kms_helper_poll_fini(ddev); drm_mode_config_cleanup(ddev);