From patchwork Fri Jul 18 03:29:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 4579711 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 28E369F37C for ; Fri, 18 Jul 2014 03:30:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4003120125 for ; Fri, 18 Jul 2014 03:30:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7A320200E1 for ; Fri, 18 Jul 2014 03:30:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B6EC16E712; Thu, 17 Jul 2014 20:30:22 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f43.google.com (mail-qg0-f43.google.com [209.85.192.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 354B66E712 for ; Thu, 17 Jul 2014 20:30:21 -0700 (PDT) Received: by mail-qg0-f43.google.com with SMTP id a108so2803284qge.30 for ; Thu, 17 Jul 2014 20:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0MYhLmN7jdkWO2OGVqnC4QBGuA2CH8XmYuuuwkuUG/s=; b=0Bs5yJsKU58V20VM4cQMo9S/nOVblfWarScSjjGooooN2nebv6g4mupXm4GuFKLW3a fpIc3FiXDqPDQWbshE+No9zBeuQdCw4DBXDz3Sraw8D6MgnagBKicGrG700HsemukdSp KtzzgQQZtyiAlDyAkK6nhmV9GZDPdDRl0e8r7pNY6kLIUYEcJ7JmGc04DV9Yh3QGzm2Y nHqL+e2XPL9NJqplXSqpCa6gWwgnjpUyCUeZbErCIP33Gjqi9UgsogNjxFoyQ4M2OuHu P47zPT/fGBzEslK7WevVD8Qm+V782XD5acjqhi0DQkJ3xMd0G4dYieUBAhvUdHFXcYJ3 47rw== X-Received: by 10.140.18.243 with SMTP id 106mr2448516qgf.105.1405654220731; Thu, 17 Jul 2014 20:30:20 -0700 (PDT) Received: from localhost ([172.56.22.126]) by mx.google.com with ESMTPSA id d10sm7803424qaq.10.2014.07.17.20.30.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 20:30:20 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH 02/10] drm/bochs: use helpers Date: Thu, 17 Jul 2014 23:29:57 -0400 Message-Id: <1405654205-30810-3-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405654205-30810-1-git-send-email-robdclark@gmail.com> References: <1405654205-30810-1-git-send-email-robdclark@gmail.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Signed-off-by: Rob Clark --- drivers/gpu/drm/bochs/bochs_kms.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index dcf2e55..b3c6130 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -216,18 +216,9 @@ static struct drm_encoder * bochs_connector_best_encoder(struct drm_connector *connector) { int enc_id = connector->encoder_ids[0]; - struct drm_mode_object *obj; - struct drm_encoder *encoder; - /* pick the encoder ids */ - if (enc_id) { - obj = drm_mode_object_find(connector->dev, enc_id, - DRM_MODE_OBJECT_ENCODER); - if (!obj) - return NULL; - encoder = obj_to_encoder(obj); - return encoder; - } + if (enc_id) + return drm_encoder_find(connector->dev, enc_id); return NULL; }