From patchwork Fri Oct 6 21:42:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 149424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp610149vqo; Fri, 6 Oct 2023 14:43:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfhyaBTreUZni8+wn/DS8y/yi/XbskXEsZGwU6dTO7XnjMkSF4ba2vB+2jwAUQDK+XuuLX X-Received: by 2002:a17:902:ec8f:b0:1c5:ee21:ce33 with SMTP id x15-20020a170902ec8f00b001c5ee21ce33mr11694025plg.23.1696628609139; Fri, 06 Oct 2023 14:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696628609; cv=none; d=google.com; s=arc-20160816; b=lh0ZYhQfaZAjKmhdM8eoQaMFkqgyJDNPOfn7wHL1kJ8ywNvV6doWyg0PgXU1RSxXkm kewy8tOQotf+HOaEm9kmr9bWtTagJdtSXr9oooEkNIyXqu8+B7qEO8oNycJio2fve14w osqOoIqGSC5z8Ya8XR5bK/BHatVZgROSnq5gB67ioekT4mTQNf+SuOhqIWjP28l0poNm Zk54MJBAtwV0jZAVG0ATSqrh3n+ZQc8X4imdmmMDovKqsxHig2NYTOrij+zaKSUaBtqE IR7Ldy+7DcHG4sgg3iMVGFBXZuGr7GkrX8EP1AVv4pib8bdVOd7SwBxiOXSCxSi8i3sM JIyg== 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:dkim-signature; bh=uabxR2E3i8VAS3HmMlzLIftv/jxJmtXF0wj4Yv/X63I=; fh=q4P7/H3rgKXacl4w575QtTMldaBk2Lg1LutmCffEXfw=; b=Bb0YahWu/10zpQPUhutC8dbLwbkSNsNAV8MwhoBZkwyohCJqadVMucQK3i/lIU8atW /NbIS7PUVuooKGcuik1vQVnkUkwIllnNbsO0GzuLrXb/j2FXej2AjHfOHre2twAgr6lM ydKdUOO4p4Ll8Zs9l/gxh2OMezvKR+4//OeZuOfPju8AuaaCrB7bbCjB0xOaE/Wc89J3 Vd8LLS+fcX0bpPzMYfpGCcmzuq9puEndLO6fp/WgXTbE+OkIJDWK1l4qes030r8YsiGf cS6HvBgut+312PsWSzzAp9KZloLRoNUHlVKwUWSHDieiXayPB8l3Y66H0SsW9g3DWZjy U7Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Qbu8V/Lt"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id o6-20020a170902d4c600b001c5c370d4d3si4787536plg.534.2023.10.06.14.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 14:43:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Qbu8V/Lt"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 9296680D653B; Fri, 6 Oct 2023 14:43:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233713AbjJFVmy (ORCPT + 18 others); Fri, 6 Oct 2023 17:42:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233383AbjJFVmw (ORCPT ); Fri, 6 Oct 2023 17:42:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BD36BE; Fri, 6 Oct 2023 14:42:51 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 270BDC433C9; Fri, 6 Oct 2023 21:42:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696628570; bh=BY2TXeqT8YZGo3EdVf/PnRPzaAn6+6wspkNGCDNbH18=; h=From:To:Cc:Subject:Date:From; b=Qbu8V/LtW9ChV9JB3G2/g/aethYY6kFIakrXJkyc4/Nx//lOwkLY0w5TEMjC7e796 vszD/9XBLwq0eIj8OT7M5u9UMYPlMaAUDIEqrO7uLubpgq0P9VCcfGzfymb8+TvALO 5JPX0KzJKdNXDkiX68fmKdJAFdqk8XY1HBP2p57UdtvMS2gCBCreiXRMMyS4UYgUUx 9OAX+auHM2RgBLZLA/y7/DgLNxU1gBq8LG6bxd8JwSV9cZyTzmqd4E7QPlIGOVHETJ LFuk+fNg7yP8sPXwslf5w2A8eosELUlGFCG92PEsMK0luW8GE+PUoCLnk9GwVo1se2 4971OZ9QYjUAQ== Received: (nullmailer pid 337511 invoked by uid 1000); Fri, 06 Oct 2023 21:42:49 -0000 From: Rob Herring To: Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] tpm: nuvoton: Use i2c_get_match_data() Date: Fri, 6 Oct 2023 16:42:45 -0500 Message-Id: <20231006214246.337426-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Fri, 06 Oct 2023 14:43:16 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779044040614342323 X-GMAIL-MSGID: 1779044040614342323 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/char/tpm/tpm_i2c_nuvoton.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c index d7be03c41098..5490f7e0fa43 100644 --- a/drivers/char/tpm/tpm_i2c_nuvoton.c +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c @@ -19,7 +19,8 @@ #include #include #include -#include +#include +#include #include "tpm.h" /* I2C interface offsets */ @@ -524,7 +525,6 @@ static int get_vid(struct i2c_client *client, u32 *res) static int i2c_nuvoton_probe(struct i2c_client *client) { - const struct i2c_device_id *id = i2c_client_get_device_id(client); int rc; struct tpm_chip *chip; struct device *dev = &client->dev; @@ -546,15 +546,8 @@ static int i2c_nuvoton_probe(struct i2c_client *client) if (!priv) return -ENOMEM; - if (dev->of_node) { - const struct of_device_id *of_id; - - of_id = of_match_device(dev->driver->of_match_table, dev); - if (of_id && of_id->data == OF_IS_TPM2) - chip->flags |= TPM_CHIP_FLAG_TPM2; - } else - if (id->driver_data == I2C_IS_TPM2) - chip->flags |= TPM_CHIP_FLAG_TPM2; + if (i2c_get_match_data(client)) + chip->flags |= TPM_CHIP_FLAG_TPM2; init_waitqueue_head(&priv->read_queue);