From patchwork Tue Oct 17 20:34:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 154508 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4384751vqb; Tue, 17 Oct 2023 13:34:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHm6rvDrWh0ZCidCxpqAczRgm1Lrnv/PQSL1PbvwLwXfPIzOkdOE2mryz3r1Wip2QCOPxRc X-Received: by 2002:a17:90b:3802:b0:27c:f653:37b2 with SMTP id mq2-20020a17090b380200b0027cf65337b2mr3582643pjb.1.1697574894517; Tue, 17 Oct 2023 13:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697574894; cv=none; d=google.com; s=arc-20160816; b=rOsSX5RuB6+aG1InfC9lFv2TJRILgpdZVpk403mCJUIt0ze+Xc8/gbdIRZ9umxceu1 JOAK9ORd6F54+tz7+l7vecBueb47GSf5xmLSaESAyyFbW5+nOF2O0x5DVjGfTwTC+V1y dkP2f1qQvfUwTuE16YEZi1tIjKjt6X+PsyM/4GZTmn1Bnc8EAoZP1uqEoqfwTIc0fMcQ 8bFhXxSjub4JVg1w5v+q4B8c00Yz65BuM+tFSA8Eazym678m4iYl5oPw396fVQkba7Kw zjhgwoP7f1GysKP+vCkNqGIEGWPH31ylc0l6aUh/zGN+g5Vlz7cJIhx+CGcd0+2jOWEN h4NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=RjMxNklY9G/+xqQ/lM5xPuWR9yO1uXO1qqREMwyoCLU=; fh=f7kKwzmL5vxF4veDVPOUXfdfrXE6R1bevnyo30p5Vps=; b=KoC00EggMWxerkb93rGuwxtZ/2zD6m/nKjidhgMi6XxlV/3Rx+Tr/dicckwO6ZBuV7 iHFJeC67ja2/WAc/xI3uKDMqoFtaBN6ImQICKMCwVjBUoSWVMGk5oy/MY9K8kWv2GFny xtZn5BxYOUfUdAJL1iVGCO0wK8KrKEXx5ggjCVB3u8lCGtIOCTgbWr8FNV2x0Bj67L+5 7ZYnYZ8MpK7EumAdynR7rCoK4Z3/pO9xlE5/hcnweM+RcegHhwH+zNn9x9vE2yAKx/p4 Uslfkl3nRTHFJ5rAkv2COZhWNYTv2AA1RGp01Z4MfMgITL0D0r/mmV8g/0zbHxZxYTYB E6CA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id kk15-20020a17090b4a0f00b0027d032092d7si10096501pjb.184.2023.10.17.13.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 13:34:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id A1D1E80DD6A8; Tue, 17 Oct 2023 13:34:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343689AbjJQUel (ORCPT + 21 others); Tue, 17 Oct 2023 16:34:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231149AbjJQUek (ORCPT ); Tue, 17 Oct 2023 16:34:40 -0400 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 212F8BA for ; Tue, 17 Oct 2023 13:34:39 -0700 (PDT) Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3af957bd7e9so3924899b6e.3 for ; Tue, 17 Oct 2023 13:34:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697574878; x=1698179678; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RjMxNklY9G/+xqQ/lM5xPuWR9yO1uXO1qqREMwyoCLU=; b=hn2ce0fMUJOm4wbstqtggLq7iHP9bi6gSPQasH60fWYND8228Gw+JMDMFC82l/mUCY bvIuOjUCF4JyhLbEPBYAvCAtF6L0iXdQb+pqWeWokIFCXNT9wyTKjD4WETkefQUbe3Jk th4u+RZdrUJjGGGgyIL0Gj70J9eopFAtk6vEd6FeXBsLQBGo3QT99DX+spEQhOiYAIXs V/oCfWqQTcr53OwDw7AXuO2JMSl1R5k8OxqoIC6W4AXaCr7Zlhz5l1iIUZMg9eygw42n K038pH4F058G3l1j/PNK3yesdgVin5pNfkA5RerS2MFieusRmK+/MQ8SrplOEGmFm2JM bC/g== X-Gm-Message-State: AOJu0Yyhj75iJLoO0s0SYDqQuUNMUktXFIfKLpTP8bmRCnALw4vo1vDN U1BurprCiuoAJ60JAgjZ6A== X-Received: by 2002:a54:4706:0:b0:3ad:29a4:f560 with SMTP id k6-20020a544706000000b003ad29a4f560mr3760803oik.34.1697574878227; Tue, 17 Oct 2023 13:34:38 -0700 (PDT) Received: from herring.priv (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id z26-20020a54459a000000b003af60f06629sm379032oib.6.2023.10.17.13.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 13:34:37 -0700 (PDT) Received: (nullmailer pid 2699232 invoked by uid 1000); Tue, 17 Oct 2023 20:34:36 -0000 From: Rob Herring To: Support Opensource , Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org Subject: [RESEND PATCH] regulator: da9121: Use i2c_get_match_data() Date: Tue, 17 Oct 2023 15:34:28 -0500 Message-ID: <20231017203429.2699039-1-robh@kernel.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 17 Oct 2023 13:34:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780036292557335253 X-GMAIL-MSGID: 1780036292557335253 Use preferred i2c_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Signed-off-by: Rob Herring --- drivers/regulator/da9121-regulator.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/regulator/da9121-regulator.c b/drivers/regulator/da9121-regulator.c index 80098035bb13..b551a400bdd1 100644 --- a/drivers/regulator/da9121-regulator.c +++ b/drivers/regulator/da9121-regulator.c @@ -13,7 +13,7 @@ // // Copyright (C) 2020 Dialog Semiconductor -#include +#include #include #include #include @@ -1117,17 +1117,6 @@ static const struct of_device_id da9121_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, da9121_dt_ids); -static inline int da9121_of_get_id(struct device *dev) -{ - const struct of_device_id *id = of_match_device(da9121_dt_ids, dev); - - if (!id) { - dev_err(dev, "%s: Failed\n", __func__); - return -EINVAL; - } - return (uintptr_t)id->data; -} - static int da9121_i2c_probe(struct i2c_client *i2c) { struct da9121 *chip; @@ -1141,7 +1130,7 @@ static int da9121_i2c_probe(struct i2c_client *i2c) } chip->pdata = i2c->dev.platform_data; - chip->subvariant_id = da9121_of_get_id(&i2c->dev); + chip->subvariant_id = (enum da9121_subvariant)i2c_get_match_data(i2c); ret = da9121_assign_chip_model(i2c, chip); if (ret < 0)