From patchwork Wed Nov 15 20:57:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 165596 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2806170vqg; Wed, 15 Nov 2023 12:57:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDdsTgj5+5MU9qCiOHytGRsHAdqOctnYijQgaZ+qnSetcjbGWgchODHIpRr2mWTq3Szq4V X-Received: by 2002:a17:90b:1d8e:b0:27d:3be:8e13 with SMTP id pf14-20020a17090b1d8e00b0027d03be8e13mr12020493pjb.12.1700081879223; Wed, 15 Nov 2023 12:57:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700081879; cv=none; d=google.com; s=arc-20160816; b=yjMEPQsFJwQd8EoLwMlMoeML1VPUz3sK+PSEUaWTA7i7nkUWMe921tsR2zSvE5QPve gXVVK3VgURCLhqr7kP7GLXxaPjlRuINfJQXUqefZyDcwjPf51XxSLMLFJhNaGurXikTn JQwrPaKgzTkgdlBhA8jjGEUCijVSrV2wX4h6Sdn2FSXoRTjOLDK5hA7NodSnMNyBkx06 2rXld0mLKape/KsIIhb9EN04HFsICWCBnR8JScB+Szvu9yRFG/Dsz9AlZKVkL6thfzNF Hmze0IdUx596PFf+/1+ARIBOYpYQTT9iDZIOyKqdCz92wcAFMK5p13rdN6g7rCN7i2A9 mncw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=yn8cWgc0LR3eqt+tX9p4U9PZWhRMqUpEjC58C6kq9fE=; fh=lwMH+ktKKNns6HwdJFGr5ruQtEtRlhBLkIlm9b/lScU=; b=aLXLXe2LrLC2dfdnKPhbdaLlh5LtHm8lAahLeIxFMrJGgdMsg4+YAT3BOe/XcDlJ6H cPseBKqh/wltxxs2xYuZsA/93vxgaW+hdkTkE03UcB7+f57ynjo2c4Wd228EN9JMStyR Q64xeV03SsjDTySKq8SQqJgYihro3MXK9yZCQIEjUWcaMFsTb//XyDMrn+ynl7jiXPjp 7jtJPlnxhRfImRcfUgEsm9ma/4t+aiLWQEHGEtg5WybSJcvbOdCHcbEAYe4s1a4qrHVR 2G+3CkA8lesLwX1hIJ2WB7V8XB7HIXbewxOI7CuciO/wgLDnjLIEB+sWCpecauffodrc GoNQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id e31-20020a17090a6fa200b002791d79bbf9si432432pjk.187.2023.11.15.12.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:57:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id C053480C47B0; Wed, 15 Nov 2023 12:57:47 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344592AbjKOU5X (ORCPT + 29 others); Wed, 15 Nov 2023 15:57:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235071AbjKOU5P (ORCPT ); Wed, 15 Nov 2023 15:57:15 -0500 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B2C7198; Wed, 15 Nov 2023 12:57:10 -0800 (PST) Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-6cd09663b1cso42391a34.3; Wed, 15 Nov 2023 12:57:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081830; x=1700686630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yn8cWgc0LR3eqt+tX9p4U9PZWhRMqUpEjC58C6kq9fE=; b=B/g6bTNulvrF4D1C+on42Mpg0ksJJv4fQ7mMXVN8wFA+ixA2t6Pu6GlKQhgF+913zX qHkfBva41hfWQElalsz1zX2SaiSU89HA+Hh4vTb+c6rvxdQociP042n9JiKdg+VJsdCK q/rI4hY2FGK9vvo20LigbPLN40Em0CAP//J9xWUGufO4drep0BKrsKOcOXjHvCkZqOQV DtFsMhay0OEsNdcCVBGMTnDLTkZsAhoT99c93bF2HtxFbyAQjl3lvg/Zfqa7o+pAyI4S CP/wvbtwXGOMeBnfI9vLkNXn0iM8qQFcaq+dAivPzGRd/wxQRfMI3t4dG0ZpdjCKoNG4 uu0A== X-Gm-Message-State: AOJu0YxMSmjRJkEd5+Ep3j1WD0KODiEN1v1G8CxMKiWxhDXX2nCi9xZF 94herRwhxZP1u5o1/XZvnNayDYFpXQ== X-Received: by 2002:a9d:6553:0:b0:6d6:45f1:d7b4 with SMTP id q19-20020a9d6553000000b006d645f1d7b4mr6684680otl.35.1700081829927; Wed, 15 Nov 2023 12:57:09 -0800 (PST) Received: from herring.priv (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id t10-20020a05683014ca00b006ce46212341sm689671otq.54.2023.11.15.12.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:57:08 -0800 (PST) Received: (nullmailer pid 3730642 invoked by uid 1000); Wed, 15 Nov 2023 20:57:06 -0000 From: Rob Herring To: Jean Delvare , Guenter Roeck Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] hwmon: lm25066: Use i2c_get_match_data() Date: Wed, 15 Nov 2023 14:57:02 -0600 Message-ID: <20231115205703.3730448-3-robh@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231115205703.3730448-1-robh@kernel.org> References: <20231115205703.3730448-1-robh@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Wed, 15 Nov 2023 12:57:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782665056855572790 X-GMAIL-MSGID: 1782665056855572790 Use preferred i2c_get_match_data() instead of of_match_device() and i2c_match_id() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Adjust the 'chips' enum to not use 0, so that no match data can be distinguished from a valid enum value. Signed-off-by: Rob Herring --- v2: - Split up per driver --- drivers/hwmon/pmbus/lm25066.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c index 929fa6d34efd..bd43457094a6 100644 --- a/drivers/hwmon/pmbus/lm25066.c +++ b/drivers/hwmon/pmbus/lm25066.c @@ -14,10 +14,10 @@ #include #include #include -#include +#include #include "pmbus.h" -enum chips { lm25056, lm25066, lm5064, lm5066, lm5066i }; +enum chips { lm25056 = 1, lm25066, lm5064, lm5066, lm5066i }; #define LM25066_READ_VAUX 0xd0 #define LM25066_MFR_READ_IIN 0xd1 @@ -468,8 +468,6 @@ static int lm25066_probe(struct i2c_client *client) struct lm25066_data *data; struct pmbus_driver_info *info; const struct __coeff *coeff; - const struct of_device_id *of_id; - const struct i2c_device_id *i2c_id; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA)) @@ -484,14 +482,8 @@ static int lm25066_probe(struct i2c_client *client) if (config < 0) return config; - i2c_id = i2c_match_id(lm25066_id, client); + data->id = (enum chips)i2c_get_match_data(client); - of_id = of_match_device(lm25066_of_match, &client->dev); - if (of_id && (unsigned long)of_id->data != i2c_id->driver_data) - dev_notice(&client->dev, "Device mismatch: %s in device tree, %s detected\n", - of_id->name, i2c_id->name); - - data->id = i2c_id->driver_data; info = &data->info; info->pages = 1;