From patchwork Tue Jun 21 09:28:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9190043 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 D4C246075E for ; Tue, 21 Jun 2016 09:28:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3B7928047 for ; Tue, 21 Jun 2016 09:28:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8B6428066; Tue, 21 Jun 2016 09:28:24 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9ADFF28047 for ; Tue, 21 Jun 2016 09:28:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9898E6E668; Tue, 21 Jun 2016 09:28:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lb0-x244.google.com (mail-lb0-x244.google.com [IPv6:2a00:1450:4010:c04::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 543956E5F6 for ; Tue, 21 Jun 2016 09:28:15 +0000 (UTC) Received: by mail-lb0-x244.google.com with SMTP id ur4so1144450lbc.3 for ; Tue, 21 Jun 2016 02:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=wJz/ME/RuDXFLDPDY55nPLOAVmErqXOEpH1GyjVF3b4=; b=elXSclET9Wr1wIxWCXoGJYVtMcV4m9IMlcwupJtdsGH5CoK4YUCm0E+MCYS695JjAc jdriQ9UfmdSW4B8+8YMiz96UFYRJT1WktE83Jt5AJ+4zZzsQpbadtKMyKHLIBIg1bqyk UJknqxRw0Ryrj9DQWelqM4otCg3lT+ZlT/NJn3MdV4dGP3GiQDTVkujkGOdfIVPe7iK8 hajVpz7B/2l6x9K9qyr6h9eUa6XWDQyEm8rPwmDialYDUebVdRBsliWwYQHtDRFCTC75 Lbx5DzURj/VE8Gc/gadLXCaarCouTv+SSe4qtpCoiifogxZBSUP1kDPMNwbaMZWSTfjh ksGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=wJz/ME/RuDXFLDPDY55nPLOAVmErqXOEpH1GyjVF3b4=; b=CBw6JqszeHmOY/1ye5ZQ278FJmTvyPOsLTu+yZo11JkLm3St9cZjakmsJeoDTdIfKx hDHghCrVOsL8pPz1ux25V8++djMS/7KeHX7gklRG0pZLRa+YXVcUZ3q7lH6KIpRI/aOI SrrwwnxTyVvvTVP772tueg5qagMbl2AjoWfBnFuXlPPBFho3MJ2yaBwIVe3+SWB0Y1Sj daRpqelgaHU5Ucc4PswoKGTtSuHqScpZbjfz5k4fTIQ7xK37iVG/buF8/70Dmk8FAJwW EEAH7uLA88rw54l8zfe5c8qExx1WoLJ/EXI9p1YX9nstym1jO2b+Zvr7D+ues64ljPNl dFOQ== X-Gm-Message-State: ALyK8tKvNIsuFoqKltbMxxgFr2a8Oy5NeUXYBKiGAMRBIJtIoZmHWKXOts/EAITuY4m7GQ== X-Received: by 10.194.162.168 with SMTP id yb8mr20593582wjb.32.1466501293132; Tue, 21 Jun 2016 02:28:13 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id u64sm2050460wmd.8.2016.06.21.02.28.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 02:28:12 -0700 (PDT) From: Chris Wilson To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/3] drm/sun4i: Remove open-coded drm_connector_register_all() Date: Tue, 21 Jun 2016 10:28:03 +0100 Message-Id: <1466501283-19976-4-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466501283-19976-1-git-send-email-chris@chris-wilson.co.uk> References: <1466501283-19976-1-git-send-email-chris@chris-wilson.co.uk> Cc: Daniel Vetter , Chen-Yu Tsai , Maxime Ripard , linux-arm-kernel@lists.infradead.org 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 drm_dev_register() will now register all known connectors, so we no longer have to do so manually. Signed-off-by: Chris Wilson Cc: Maxime Ripard Cc: David Airlie Cc: Chen-Yu Tsai Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org --- drivers/gpu/drm/sun4i/sun4i_drv.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 68e9d85085fb..59cd8b27ee02 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -24,34 +24,6 @@ #include "sun4i_layer.h" #include "sun4i_tcon.h" -static int sun4i_drv_connector_plug_all(struct drm_device *drm) -{ - struct drm_connector *connector, *failed; - int ret; - - mutex_lock(&drm->mode_config.mutex); - list_for_each_entry(connector, &drm->mode_config.connector_list, head) { - ret = drm_connector_register(connector); - if (ret) { - failed = connector; - goto err; - } - } - mutex_unlock(&drm->mode_config.mutex); - return 0; - -err: - list_for_each_entry(connector, &drm->mode_config.connector_list, head) { - if (failed == connector) - break; - - drm_connector_unregister(connector); - } - mutex_unlock(&drm->mode_config.mutex); - - return ret; -} - static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe) { struct sun4i_drv *drv = drm->dev_private; @@ -187,14 +159,8 @@ static int sun4i_drv_bind(struct device *dev) if (ret) goto free_drm; - ret = sun4i_drv_connector_plug_all(drm); - if (ret) - goto unregister_drm; - return 0; -unregister_drm: - drm_dev_unregister(drm); free_drm: drm_dev_unref(drm); return ret;