From patchwork Wed Nov 15 20:57:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 165597 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2806166vqg; Wed, 15 Nov 2023 12:57:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IH79sadd5yuSIgozDeBRmFgzVXvBYNUbu2OQzwlB8LEZIIVpWb7IDkoH5GfMu9BzdQoKy6j X-Received: by 2002:a17:90b:1e04:b0:280:18ba:f016 with SMTP id pg4-20020a17090b1e0400b0028018baf016mr15819657pjb.47.1700081879209; 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=AhjGt+27Qi0AofY9nzG43sBxN2UxkLwYfWU6O57z42Uy0WXNz13ET1qASVvyAuSyvJ cXjxJXtjaGYU+VEDgRqEg+SeUepggnUj7cGnH4ofQxrki0SiZLKZvfJr5ajNEEHgn45T 2o+FliExSYvqjRGy7e9VhA3+FifcA2O1asmHDhVD+kgKjson2oxZ8NZOXdOIVth3LMZT i2dCWdfjOfRUzCV6/ZXGUqZoEE7lAZOOgATvrXkIwC+t8kh9UwYc+W0nicpiuJJ0kjG3 36/ZfwiCOE8UdSOvIU81xnbJBZ1T8QhBgF7j0Vdvt/tgSBC5/K+L5ieZ/vZuOsvhdpSz kYPw== 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=kOK7JO5EOhsngaH3Qx/xmibO/SIbJATRMlHbrH/xpaY=; fh=lwMH+ktKKNns6HwdJFGr5ruQtEtRlhBLkIlm9b/lScU=; b=iEeik0pnQ3eQAha/OAmy6muwOf0CZAJZnMy20Y9+CYAunmEkC0RyiyFqbYlpiZGIJ9 xZ4vmLkJSf7lgDnL4MvSED2m3yPVVRPkfuJgQ8U+0ZPRml0IWHn+zL0o6e2+4I5MsPJ2 +qYi1QlJ4zi5ODwfp/jIw4pyUbfg76YQ6QLkN+OgsxI+H3wetRnza0/Tl76PwFgD90Fl HziTbP4t2Vl3SyDDwkvAjafE9wzUuu20R66VOdCeQ5hXqrlIOCDTtJSna73T1JmO7yCx n+xZcQ8Lvs0FInOHilkfjiOyGLUzL8exePlf5nThvpPhslGvkQw6zGgkLr5pHLVdsepH YNWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id ot3-20020a17090b3b4300b002832041e149si454379pjb.167.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 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 C2EF080C47B2; 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 S1344569AbjKOU5S (ORCPT + 29 others); Wed, 15 Nov 2023 15:57:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235064AbjKOU5N (ORCPT ); Wed, 15 Nov 2023 15:57:13 -0500 Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B56C195; Wed, 15 Nov 2023 12:57:08 -0800 (PST) Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6ce2fc858feso42009a34.3; Wed, 15 Nov 2023 12:57:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081827; x=1700686627; 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=kOK7JO5EOhsngaH3Qx/xmibO/SIbJATRMlHbrH/xpaY=; b=ltpx2begib1pfLOz28zgib2Zf/HdiXqnOmVfxkQ998WLeQ4GiCmcBsm2M7sd4ynkP2 W6QaHczY1ZZPRnZCJF6p8KPa3rAq+a4BB385yq1lvF+oMrjQnA7Ndb2KaFmIYTQ8DvET +yX5HjhPH0dWjfDl6Qcc8cT8cp53P65AGptRvhL9ErrH/qJ+rSWD3Y2FAJpMcwEVLOff V6KxUOxm2ZHz2PPjLTNSul65xGnSF1cgyHN8+1ZmdH9RmGwlpSXeq+N5qqAXi3InlrRd WYvbV3DvfDjKN8w66hqr5Vxc5eW6y+sJX/AcUXeZqSFGYZMfzFLuVYjLNLZmDg697qtC dAvg== X-Gm-Message-State: AOJu0Yzkc9NxDPqdQpn2dvUO44b4sBr9FkCGaM1/rR3E9Qaw4ZXj4Gwz 4A3WbbM3t77Dned17keEwwISFtV1Sw== X-Received: by 2002:a05:6870:f609:b0:1ef:9234:aa2a with SMTP id ek9-20020a056870f60900b001ef9234aa2amr15024607oab.37.1700081827470; Wed, 15 Nov 2023 12:57:07 -0800 (PST) Received: from herring.priv (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id c1-20020a056870a58100b001eb0e8b75cdsm1868316oam.10.2023.11.15.12.57.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:57:06 -0800 (PST) Received: (nullmailer pid 3730597 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 1/3] hwmon: max6650: Use i2c_get_match_data() Date: Wed, 15 Nov 2023 14:57:00 -0600 Message-ID: <20231115205703.3730448-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,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: 1782665056812977295 X-GMAIL-MSGID: 1782665056812977295 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. Signed-off-by: Rob Herring --- v2: - Split up per driver --- drivers/hwmon/max6650.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c index cc8428a3045d..9649c6611d5f 100644 --- a/drivers/hwmon/max6650.c +++ b/drivers/hwmon/max6650.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include /* @@ -763,8 +763,6 @@ static int max6650_probe(struct i2c_client *client) { struct thermal_cooling_device *cooling_dev; struct device *dev = &client->dev; - const struct of_device_id *of_id = - of_match_device(of_match_ptr(max6650_dt_match), dev); struct max6650_data *data; struct device *hwmon_dev; int err; @@ -776,8 +774,8 @@ static int max6650_probe(struct i2c_client *client) data->client = client; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); - data->nr_fans = of_id ? (int)(uintptr_t)of_id->data : - i2c_match_id(max6650_id, client)->driver_data; + + data->nr_fans = (uintptr_t)i2c_get_match_data(client); /* * Initialize the max6650 chip