From patchwork Thu May 20 12:13:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12270213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33DF5C433ED for ; Thu, 20 May 2021 12:50:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17E6861163 for ; Thu, 20 May 2021 12:50:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243219AbhETMvu (ORCPT ); Thu, 20 May 2021 08:51:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233577AbhETMvL (ORCPT ); Thu, 20 May 2021 08:51:11 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46C21C06137D for ; Thu, 20 May 2021 05:14:04 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id d11so17399310wrw.8 for ; Thu, 20 May 2021 05:14:04 -0700 (PDT) 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=940Pm8CefdQzyyIg56xRkqD6T8o98OEZl2VZ5CfbfUg=; b=gsD4YvNGz6XEiS8m2K0f4bKq1QMIQRDXUhSl3sV8sFCEHSHo/Vqa4aqmflJzFfz7dB VRJ4K9DcbF+hkb08JKUH+rbVDcZamjjDFSjgXZ/v+3BAl8xb4WbRmaLJSps5pce0dEnS RuxwdEkiWfwm+aq24EO+8Sk2AKhpwUUfgQ0tNoogyN/G6W28VmfT4Ff5aWwg6tWWF/cq N3WdZdhAM6C52dFABJk16yJDMXcoeaVcnPMGIXX8Qe3A+p7Yl9rS9u6N1jkY8L4Qq5gK IvQzwPOwlUgYkcoCLxptgCPiQPXvOrL+3yKgAkEUCZw1bfgzRCMbyR23e19YGdjGAcWO 8l2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=940Pm8CefdQzyyIg56xRkqD6T8o98OEZl2VZ5CfbfUg=; b=bAdebFXsdrOl4XpaVmATHI5OAqDLRMlYfioecvJIxgARuoFxpI/4OsHQNYOIFLItWg ADNrVeO7pFwbmwkexM59zUQk85L6iJhjeLLfcLGgwFAMlaqPgLHVxbR+gUOQXFJmsdRt NYtzgwsV/ITH/9T3ibg1d9J1kJlrGEWvNfZGMY8PI79eL2e0hMiKEZJb7Yl480MkhJfc GBxpNaLPnmiutGqW/Y9Bvp3rfSSWLCp6rpuvh4mIUUXQYZStiY+Z/eIAaRFR+cb1kI8z bHxl21Kw91tnLIgs5bEVHeeDXWT49X7TqUsiPlZzrioJuc4t87A67+hOGcAnMAf5L3x0 PAOg== X-Gm-Message-State: AOAM5325rIVVE9I5oq1QZB7IjvThGikE37EcQvifqswJ42v7RqTx5j1R iemMtYKApUz2zQsxPc+z3GOkXjsa78lusw== X-Google-Smtp-Source: ABdhPJxZlfpA2q3fQh/gHectPuex1dWdbLtpJHYBH3TSDl/TuBOqqjGHREb245epFxVX90loTEAfFw== X-Received: by 2002:a5d:5249:: with SMTP id k9mr4008493wrc.301.1621512842936; Thu, 20 May 2021 05:14:02 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id 61sm3393704wrm.52.2021.05.20.05.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 05:14:02 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , van Doorn , Dave Safford , Reiner Sailer , Kylene Hall , linux-integrity@vger.kernel.org Subject: [PATCH 07/16] char: tpm: tpm1-cmd: Fix a couple of misnamed functions Date: Thu, 20 May 2021 13:13:38 +0100 Message-Id: <20210520121347.3467794-8-lee.jones@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520121347.3467794-1-lee.jones@linaro.org> References: <20210520121347.3467794-1-lee.jones@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Fixes the following W=1 kernel build warning(s): drivers/char/tpm/tpm1-cmd.c:325: warning: expecting prototype for tpm_startup(). Prototype was for tpm1_startup() instead drivers/char/tpm/tpm1-cmd.c:621: warning: expecting prototype for tpm_continue_selftest(). Prototype was for tpm1_continue_selftest() instead Cc: Peter Huewe Cc: Jarkko Sakkinen Cc: Jason Gunthorpe Cc: van Doorn Cc: Dave Safford Cc: Reiner Sailer Cc: Kylene Hall Cc: linux-integrity@vger.kernel.org Signed-off-by: Lee Jones Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm1-cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index ca7158fa6e6cd..f7dc986fa4a0a 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -312,7 +312,7 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) #define TPM_ST_CLEAR 1 /** - * tpm_startup() - turn on the TPM + * tpm1_startup() - turn on the TPM * @chip: TPM chip to use * * Normally the firmware should start the TPM. This function is provided as a @@ -611,7 +611,7 @@ int tpm1_pcr_read(struct tpm_chip *chip, u32 pcr_idx, u8 *res_buf) #define TPM_ORD_CONTINUE_SELFTEST 83 /** - * tpm_continue_selftest() - run TPM's selftest + * tpm1_continue_selftest() - run TPM's selftest * @chip: TPM chip to use * * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing From patchwork Thu May 20 12:13:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12270215 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6878C433B4 for ; Thu, 20 May 2021 12:50:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B543861184 for ; Thu, 20 May 2021 12:50:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233577AbhETMvv (ORCPT ); Thu, 20 May 2021 08:51:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242860AbhETMvM (ORCPT ); Thu, 20 May 2021 08:51:12 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6192CC05BD07 for ; Thu, 20 May 2021 05:14:05 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id j14so15689013wrq.5 for ; Thu, 20 May 2021 05:14:05 -0700 (PDT) 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=9y0gA0fQbXJNYgnBVvxDNn1I72crBojCN5pP1eoOBYo=; b=Dwjglu8dczKMPgon22oVb+PqpR5pfGiatS1J8lHv3Tm2d5IFGvKPpgDv/4ZMkOwPVC ZTaUDNJ0J+iL2lu+ytEGrHhNIoOGn/XJsKydfIy4ubJiGpc0FtKzCansYm/9za14wffG NcYRb4JImwkI4pwyBSu3qznpjTxSRX4StIAoslnQ46kBzQaUtJj6UOJ5NPcGtKOHjGq+ 0CgTssMzSA9521Q7OVGuKVlH2ogq9iSFRGYXHph8KNwU3gMZW4DCLZPB1MMIDvTm+v7p kEIMSQPM7sC8KoM+bPPRc5YEkeaIfzN4TGHTiqFxIcdJXl5Fy0X+Jf1ewskE8UmxvRYc 339g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9y0gA0fQbXJNYgnBVvxDNn1I72crBojCN5pP1eoOBYo=; b=uSzNCmmcXnDZvyDEhPwqUMYvf3qpu1e4atIkDzTs4zrLlgtR7k/MWJ4cXDh50UFzJR I6OhA6oQ6wM7hlLxAZ3dQwy+qLzryUEaqNhKzSRncjjSddwe+HtQ7KFChCBVN40goNmh sTjfi0QeAbvLL8+FAeOnXCfPtg4eRyhtMzjc5ZUsP8bbYGe7IxcYOsq6xTKtTEhTDI4X o3PBPh/l0g6LlB3zauLON4kaBFyzq05vKBZfA8VEuS2lOWCAZRM8oGDlx5VHwK1vrCxB xqc0R3N9cHXurzglz4mZIksPF3o3Hq+fmR0+MRFNlwEb+XdA6DcxM3EqIWPzDzH0NDA/ 5mlA== X-Gm-Message-State: AOAM530f97nlIX2sHkcW26efzaVHCV1hKwjxnPj+iJQXarDRi3cQFppT P/oszShYEVFvbCRywrX8NDBl8A== X-Google-Smtp-Source: ABdhPJwaNdYgAYB+0XLU/rHo3whTXtJZreRhrDbouJQj0lUenFGdNCKjcXPpYdI64az4oL5s3RQdNQ== X-Received: by 2002:adf:faca:: with SMTP id a10mr4047923wrs.9.1621512844027; Thu, 20 May 2021 05:14:04 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id 61sm3393704wrm.52.2021.05.20.05.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 05:14:03 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , Thirupathaiah Annapureddy , linux-integrity@vger.kernel.org Subject: [PATCH 08/16] char: tpm: tpm_ftpm_tee: Fix a couple of kernel-doc misdemeanours Date: Thu, 20 May 2021 13:13:39 +0100 Message-Id: <20210520121347.3467794-9-lee.jones@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520121347.3467794-1-lee.jones@linaro.org> References: <20210520121347.3467794-1-lee.jones@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Fixes the following W=1 kernel build warning(s): drivers/char/tpm/tpm_ftpm_tee.c:218: warning: Function parameter or member 'dev' not described in 'ftpm_tee_probe' drivers/char/tpm/tpm_ftpm_tee.c:218: warning: Excess function parameter 'pdev' description in 'ftpm_tee_probe' drivers/char/tpm/tpm_ftpm_tee.c:314: warning: Function parameter or member 'dev' not described in 'ftpm_tee_remove' drivers/char/tpm/tpm_ftpm_tee.c:314: warning: Excess function parameter 'pdev' description in 'ftpm_tee_remove' drivers/char/tpm/tpm_ftpm_tee.c:349: warning: expecting prototype for ftpm_tee_shutdown(). Prototype was for ftpm_plat_tee_shutdown() instead Cc: Peter Huewe Cc: Jarkko Sakkinen Cc: Jason Gunthorpe Cc: Thirupathaiah Annapureddy Cc: linux-integrity@vger.kernel.org Signed-off-by: Lee Jones Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_ftpm_tee.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c index 2ccdf8ac69948..2d9c0ecd43f0a 100644 --- a/drivers/char/tpm/tpm_ftpm_tee.c +++ b/drivers/char/tpm/tpm_ftpm_tee.c @@ -209,7 +209,7 @@ static int ftpm_tee_match(struct tee_ioctl_version_data *ver, const void *data) /** * ftpm_tee_probe() - initialize the fTPM - * @pdev: the platform_device description. + * @dev: the platform_device description. * * Return: * On success, 0. On failure, -errno. @@ -305,7 +305,7 @@ static int ftpm_plat_tee_probe(struct platform_device *pdev) /** * ftpm_tee_remove() - remove the TPM device - * @pdev: the platform_device description. + * @dev: the platform_device description. * * Return: * 0 always. @@ -342,7 +342,7 @@ static int ftpm_plat_tee_remove(struct platform_device *pdev) } /** - * ftpm_tee_shutdown() - shutdown the TPM device + * ftpm_plat_tee_shutdown() - shutdown the TPM device * @pdev: the platform_device description. */ static void ftpm_plat_tee_shutdown(struct platform_device *pdev)