Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp2786252ybh; Mon, 16 Mar 2020 09:40:11 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt1x0+yU4dTqeuGy0KJIdcdm5WF7EJ1byCIurGRVhE63P417DkSBUlsvCxJ8ej7PNfebL8E X-Received: by 2002:aca:4fc7:: with SMTP id d190mr326100oib.100.1584376811466; Mon, 16 Mar 2020 09:40:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584376811; cv=none; d=google.com; s=arc-20160816; b=Aq4xmMJVWdN44SiScQYumeqjcmkS/SRf8jzR7ZhbYoTUeXd897qOmUkz+TSHzVGHpV p5kXryN8HsBE5+Ezi7wwrxO3UXtYg/hHRP3MfbMiwcuoHE3WmEHgpQzDvOSmICrfXCrY V4Mib0yxcP5a6llaRd7uOLeMc+ILuStud8chuKtZZchoGp0xZtA/WeG1unctg6cJf/db DsmE4npmCjMpta6NiRiOlufwgUpRKqSeH75PduMvOnuHzpOZFASSyKT87akFoCeh0HKA oYvt9GnzobPtInPKNI3C+sbXt5XaU70Q6m6A3xMDoY61ZpgHVyRtG809gbNAdA5XwB9u mFTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=epTpqU6sJLoeC8vWSsysP17hQucFbyoPori4JCaN8fc=; b=WhxukM0uUqeCKJhoNkcQTz2ilz/6T0BxFMSE7+wHocJnzanhWw12h3Y3CD+tYCmea1 5ebhnOXOtwlrle63lAEefIZipYvEyuaB+Je+p+/P4NHNpkVmr0KQ01F6TzUyCPgFAWKB nlPwnpKkm/vy5plH9ReiFnOgNGxoc6c0yWOX2dUnMex68aXZNH8HYBghwiGE1H6TSWyi bl0hmg5Q0lFNQjYBwNAd6oc/yU++NEt8vyMwvf7BFKMLz3zqeX0rmIldLpz6HhH8uJ5K oCKHnV49TrC58eOZjbCdrquBTTJ5fOtvlZYgHc2u51cHXs2RfPB+kipW+OaSbAqTsFIL kEPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g11si181075otq.309.2020.03.16.09.39.58; Mon, 16 Mar 2020 09:40:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732225AbgCPQjR (ORCPT + 99 others); Mon, 16 Mar 2020 12:39:17 -0400 Received: from sauhun.de ([88.99.104.3]:54480 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732183AbgCPQjO (ORCPT ); Mon, 16 Mar 2020 12:39:14 -0400 Received: from localhost (p54B334BA.dip0.t-ipconnect.de [84.179.52.186]) by pokefinder.org (Postfix) with ESMTPSA id 7F4EC2C1F53; Mon, 16 Mar 2020 17:39:12 +0100 (CET) From: Wolfram Sang To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm: encoder_slave: use new I2C API Date: Mon, 16 Mar 2020 17:39:07 +0100 Message-Id: <20200316163907.13709-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200316163907.13709-1-wsa+renesas@sang-engineering.com> References: <20200316163907.13709-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org i2c_new_client() is deprecated, use the replacement i2c_new_client_device(). Also, we have a helper to check if a driver is bound. Use it to simplify the code. Note that this changes the errno for a failed device creation from ENOMEM to ENODEV. No callers currently interpret this errno, though, so we use this condensed error check. Signed-off-by: Wolfram Sang --- drivers/gpu/drm/drm_encoder_slave.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c index d50a7884e69e..e464429d32df 100644 --- a/drivers/gpu/drm/drm_encoder_slave.c +++ b/drivers/gpu/drm/drm_encoder_slave.c @@ -61,13 +61,8 @@ int drm_i2c_encoder_init(struct drm_device *dev, request_module("%s%s", I2C_MODULE_PREFIX, info->type); - client = i2c_new_device(adap, info); - if (!client) { - err = -ENOMEM; - goto fail; - } - - if (!client->dev.driver) { + client = i2c_new_client_device(adap, info); + if (!i2c_client_has_driver(client)) { err = -ENODEV; goto fail_unregister; } @@ -96,7 +91,6 @@ int drm_i2c_encoder_init(struct drm_device *dev, module_put(module); fail_unregister: i2c_unregister_device(client); -fail: return err; } EXPORT_SYMBOL(drm_i2c_encoder_init); -- 2.20.1