From patchwork Wed May 24 14:51:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9746169 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 34EAB60209 for ; Wed, 24 May 2017 14:54:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A0722899A for ; Wed, 24 May 2017 14:54:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E3172899D; Wed, 24 May 2017 14:54:15 +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=ham 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 9A3042899A for ; Wed, 24 May 2017 14:54:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 98DD86E77C; Wed, 24 May 2017 14:52:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 678AB6E75E for ; Wed, 24 May 2017 14:52:52 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id g15so28185559wmc.2 for ; Wed, 24 May 2017 07:52:52 -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=gBdjbCQaUFFQhr+2XEN3D29GfVkG/uNU5pOzorqZA2A=; b=ee0EtqrjplDGKdX38JArfDHWkb/t0OQONpVgVUJ2VO6lu+DTan3f4p8HyWiZXfkFyt Ic7nmz71ULzAenjf7HTyJsmL2qtp33URy+UCjcv6vwmNIsOcPTu/oIpdX2jPxda35Osp gyd2pNcKwHqFIRkZGxoKd8ekWIE00GpADuUTk= 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=gBdjbCQaUFFQhr+2XEN3D29GfVkG/uNU5pOzorqZA2A=; b=JtPKiUNPLr/Os2japuargyN671CsC5q8xyUKxdfjMedSiKNeC4jP+DrH8j4AqEJLNy dKMm1rHQt24vV5ePb9skbIBk02Y0ZdDbjK4bOKAoATw/a8zoWvlRWzfM1qllq0BF3ZsC eQ4HBq16Jfd8OnD6UFbuN/M3AX/H/I7dkpB2+cCUrFleuxfTBLeiGwjOeP1yfdDwrG1d UoWMwmw2A1EHdo6m3XUkwQV9rB03oCk8o/4FPHBX+6uSvtndmzBPJcFJe3AHKOXhXU92 m6DhUHejDXxpxosmLuwpLu+zhUBt4Zk78HJzf/ImVnkDGbWFzrPUmrBN2tVSjEoxO3EK s3LQ== X-Gm-Message-State: AODbwcA8Yn9PBRgWZcQS1yngG8OQMWqY6kxyHlwnfW3ROFDlm0rXtQIM lVjW+ILIB4BENkSs X-Received: by 10.80.170.220 with SMTP id r28mr25290643edc.72.1495637570953; Wed, 24 May 2017 07:52:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 07:52:49 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 23/37] drm/imx: Drop drm_vblank_cleanup Date: Wed, 24 May 2017 16:51:58 +0200 Message-Id: <20170524145212.27837-24-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 , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP It's only done in the driver load error path, where vblanks don't need to be quiescent anyway. And that's all drm_vblank_cleanup does, since the core will release the vblank allocations on its own already. So drop it. Cc: Philipp Zabel Signed-off-by: Daniel Vetter Acked-by: Philipp Zabel --- drivers/gpu/drm/imx/imx-drm-core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 50add2f9e250..95e2181963d9 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -278,7 +278,7 @@ static int imx_drm_bind(struct device *dev) /* Now try and bind all our sub-components */ ret = component_bind_all(dev, drm); if (ret) - goto err_vblank; + goto err_kms; drm_mode_config_reset(drm); @@ -316,8 +316,6 @@ static int imx_drm_bind(struct device *dev) err_unbind: #endif component_unbind_all(drm->dev, drm); -err_vblank: - drm_vblank_cleanup(drm); err_kms: drm_mode_config_cleanup(drm); err_unref: