From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45C78C433F5 for ; Tue, 9 Nov 2021 07:02:57 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B5DBD611F0 for ; Tue, 9 Nov 2021 07:02:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B5DBD611F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9C5F5836EA; Tue, 9 Nov 2021 08:02:39 +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="bTHLUmbk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67109836E5; Tue, 9 Nov 2021 08:02:34 +0100 (CET) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (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 7929283695 for ; Tue, 9 Nov 2021 08:02:30 +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-wr1-x42e.google.com with SMTP id d27so31179176wrb.6 for ; Mon, 08 Nov 2021 23:02:30 -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=gZhDcb1qySaDmJmIf1A2fwciQBwofkesR+kR8EZazeE=; b=bTHLUmbkzzqJ+C5GzlosFgcu8h+ORaU2luIsHhuf6fXcwMbDWb/pSsb9QqJ4jNna6s wRuP9sgXrQiEKFEgd5ZY9EdZr14mqVbJ5IpN/sckzyPiBCbcPq6YqvH00khSHtqyUrKE 0XcBz+pdYDN960KaQZBvQXiFT/AJgqBj2QN+aq8v8j9VO0P80I20cnaACmeQ2y47F9d/ ZIXxKGgRBMoXY3J6fy4MJ/xIOq4uBmsvKct+RvvjCLJdjE8LK9Adu4FVfzpj1QD0Hi36 SVqePbpCu12hD0UDHaiiwoVRMONQGsgUB2QxobNvB+D9yCQRLMC+RsGQ1b+yYBMVpzNM FwUQ== 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=gZhDcb1qySaDmJmIf1A2fwciQBwofkesR+kR8EZazeE=; b=5Jq/W81lqTYzcTdgit9H5pnS0eBsigLLIK296ysZiaNEsOu3drGCTP+hjHCuwLCNpC FD3oz9XSKT+cwW5iK7eJ9zx5rN4ioAGepAgaktL3q+0YV0ysQWuCmRyuMDhoQKPK0foE mfhjFLXnsY+4L/VWXBJi9oNIvoGZZEHyDeZ6tuDeQdyc95CZzgNR3L0y6/KEBD24OVQl RuKPH2zkioyFRuhbIaY0NlL2HqBWfnkWzIYuZkMsRjkqd9AAeQWv3BjY6MeLIX1l/5SA o9O9tKNCX/90ZcrrTVYfRdJOTK1eU5HTyj8bL6gkanjOTBkwVtzTnlSojMSR4fwHuNM5 hgLw== X-Gm-Message-State: AOAM532tSGerM3jnZwSZ0NzC6kQG7UoxsRrfKfp58Lopsv1brdwx4aQf rIjZzXam+nonQLUP7upxuQzGzYyFpqlWJg== X-Google-Smtp-Source: ABdhPJwoN1YYCAvbDChZhfT0AP5f/PDbDEaTymDVJX570MPAJ3xXh6nyYAEcz377uDP/Grv/diyIDA== X-Received: by 2002:adf:c986:: with SMTP id f6mr6988031wrh.216.1636441350020; Mon, 08 Nov 2021 23:02:30 -0800 (PST) Received: from apalos.home ([2a02:587:4627:18c0:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id g5sm20897229wri.45.2021.11.08.23.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 23:02:29 -0800 (PST) From: Ilias Apalodimas To: u-boot@lists.denx.de Cc: trini@konsulko.com, Ilias Apalodimas , Simon Glass , Heinrich Schuchardt , Rick Chen , Sean Anderson , Heinrich Schuchardt , Masahisa Kojima Subject: [PATCH 2/8 v7] tpm: refactor function names for LPC based TPMs Date: Tue, 9 Nov 2021 09:02:16 +0200 Message-Id: <20211109070223.76456-3-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211109070223.76456-1-ilias.apalodimas@linaro.org> References: <20211109070223.76456-1-ilias.apalodimas@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 functions name are part of the new header file. So switch conflicting internal function names and defines. Reviewed-by: Simon Glass Reviewed-by: Heinrich Schuchardt Signed-off-by: Ilias Apalodimas --- 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, }; -- 2.33.1