From patchwork Sun Nov 7 21:33:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 518016 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp2739951iml; Sun, 7 Nov 2021 13:33:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwaouU8IVhuSdf3ielvc7pNQNZis9lGpqW7d3OGp6hQT0bR48UVYIwfarso8bULziydxY5p X-Received: by 2002:a17:907:1c0a:: with SMTP id nc10mr80129607ejc.211.1636320826089; Sun, 07 Nov 2021 13:33:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636320826; cv=none; d=google.com; s=arc-20160816; b=QG/JIQPFFzLqE9WJVPfhR+TGXR/zqDPshlS5muxlP0lREhUW0OyCj/NrzUVN53QR/T 2UM/2CpXT9e6fYxQwA68sQrdCEkxPCBvhSdyIMC3dJTunwBf90GsLpSG/bF2rPiYE/DJ cRVKMX0ByzmjtCHgnbN7q3mtRKa/JDz9Bw+c8KqvafDE9q2J8vkoxvbwR28yYRqAxALn sqet26lFK2SsiaQd2sVY2r9PeoOXQBIsiDlgt9IjAJkCCmUtzINt1cqFyDAxT8st4lE8 jy+LY0KZiswhUgpn4BHFxmmRkhHrRZdUW/IScuiXaG5hNwt6WF3xDLuLol5rakkggwMG J+ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JZxRo5P8fZFrC3MT+FzI0tSaspIUJ0antbq6gv5pNEw=; b=naB+CMZAziOFYzu3cW0rDtKew5blxcSLDnyKS10lU03VdOR9T5tA72h0cUhrEPY8/z v7gEsr2e8FYlyz1KEBFaHCW3ET3gX4N5AXEA7K2K/iIEF6+8ZrpSa6Q34NEo6a5KqRTw w9pMAioEnXooZvkOuMbbLjE6krxN+M/BtHXIzW8v5rC36z2g7DND4mInmklC4u6XDhU5 3QyJb2D6lLuQFNuLnFUWhOZpzKNYo+vvNZB1fzcC/m4gXJh9mZ/6Cy3AeW0jv3CLmDgt yoz2/IJ4GsJhnDQlbCQdFBqW34iZ+44+mEuKI13C7cStqooB+ptixIVGSx74RRw4/IQq uq1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bn7ZBk1z; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id h24si25042686ejt.408.2021.11.07.13.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Nov 2021 13:33:46 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bn7ZBk1z; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DB152837EF; Sun, 7 Nov 2021 22:33:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Bn7ZBk1z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9CE1C837B7; Sun, 7 Nov 2021 22:33:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 176BF837B7 for ; Sun, 7 Nov 2021 22:33:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x535.google.com with SMTP id ee33so54949026edb.8 for ; Sun, 07 Nov 2021 13:33:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JZxRo5P8fZFrC3MT+FzI0tSaspIUJ0antbq6gv5pNEw=; b=Bn7ZBk1zeCK1rSwlX7j7xZOiMM7os7ikgmrGpPJOtXmsFjidebhoPLjSn2fU1h6qjK 00r9Srdk9CYqgbLxhjXCFMsInymcN/GA33cmQbMf6GP1UL1uslnifgBcEzX9+VOiUEsb jstrkSx+UOloYEaItDNyeDkILIHpZtLWj9gCiNrMTicI0YFBHgoWCKWN4mPhpKat09LY 9Pk0+9sj6SHXe/wXOiL6jseJvXGS1JhoUgFjZS2K8SF7fEY3/EfY49Fucdrgp+ThNBJ+ VbrdQtoJ9wmHVUgNoXh1EC90UiYKSCOpWFnNBwKTZnZIWa+JG+utYgEDBe5XG3vje2vH WMTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JZxRo5P8fZFrC3MT+FzI0tSaspIUJ0antbq6gv5pNEw=; b=ww9QDFcVcZVPyQymawUC3bMlgahQ/bGaQhcr66Zxi5IVVU4xN6EhQLGA32e76IgGWI wDei3VtgkKmLkc49Gqxnq1AuTiLlpHEq1Xg6K4T/gNT5b1oeVrZT1bEJtIDNxrgV9o3t t9H93l/Wgi3aIOSvKbWomIQzIYeRZdTdJb1eU0F2vg40+6UbOv4R8J3PtU6wM5LS98sY IHQnFr5+aSJzOoXMfK9m61slUp2cg7UOu1UHAGyygFVJP1nFBuqwR7KX7Konn9nJ9FlQ AAA5kwqn/YapHfIlxGgFbxALCCUHzOFOnkLqYcm7iHph6DVN4ad4XguFmokjL4b2tlDX 7b2Q== X-Gm-Message-State: AOAM533sYP2zzORwQvXT1wnX6s1IuyZ++JQHmGm0QWFx267c3W0LLhGt WWbDeWsUr7uvwwgu3jGMcXtxTCNJ2KDrmw== X-Received: by 2002:a17:907:97d0:: with SMTP id js16mr6809633ejc.199.1636320799682; Sun, 07 Nov 2021 13:33:19 -0800 (PST) Received: from apalos.home ([2a02:587:4680:8a9c:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id hw8sm5042150ejc.58.2021.11.07.13.33.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Nov 2021 13:33:19 -0800 (PST) From: Ilias Apalodimas To: u-boot@lists.denx.de Cc: trini@konsulko.com, Ilias Apalodimas , Rick Chen , Simon Glass , Sean Anderson , Heinrich Schuchardt , Masahisa Kojima Subject: [PATCH 2/8 v6] tpm: refactor function names for LPC based TPMs Date: Sun, 7 Nov 2021 23:33:05 +0200 Message-Id: <20211107213312.263357-3-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211107213312.263357-1-ilias.apalodimas@linaro.org> References: <20211107213312.263357-1-ilias.apalodimas@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean With the upcoming TPM2 API, some of the function names are part of the new header file. So switch conflicting driver defined function names and defines. Signed-off-by: Ilias Apalodimas Reviewed-by: Simon Glass Reviewed-by: Heinrich Schuchardt --- drivers/tpm/tpm_tis_lpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c index 003c0d8816d0..13a133d58ebd 100644 --- a/drivers/tpm/tpm_tis_lpc.c +++ b/drivers/tpm/tpm_tis_lpc.c @@ -443,7 +443,7 @@ static int tpm_tis_lpc_open(struct udevice *dev) return 0; } -static int tpm_tis_get_desc(struct udevice *dev, char *buf, int size) +static int tpm_tis_lpc_get_desc(struct udevice *dev, char *buf, int size) { ulong chip_type = dev_get_driver_data(dev); @@ -458,7 +458,7 @@ static int tpm_tis_get_desc(struct udevice *dev, char *buf, int size) static const struct tpm_ops tpm_tis_lpc_ops = { .open = tpm_tis_lpc_open, .close = tpm_tis_lpc_close, - .get_desc = tpm_tis_get_desc, + .get_desc = tpm_tis_lpc_get_desc, .send = tis_senddata, .recv = tis_readresponse, };