| Message ID | 20210520121347.3467794-8-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rid W=1 warnings from Char | expand |
On Thu, May 20, 2021 at 01:13:38PM +0100, Lee Jones wrote: > 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 <peterhuewe@gmx.de> > Cc: Jarkko Sakkinen <jarkko@kernel.org> > Cc: Jason Gunthorpe <jgg@ziepe.ca> > Cc: van Doorn <leendert@watson.ibm.com> > Cc: Dave Safford <safford@watson.ibm.com> > Cc: Reiner Sailer <sailer@watson.ibm.com> > Cc: Kylene Hall <kjhall@us.ibm.com> > Cc: linux-integrity@vger.kernel.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Thanks, I'll apply this. > --- > 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 > -- > 2.31.1 > > /Jarkko
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
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 <peterhuewe@gmx.de> Cc: Jarkko Sakkinen <jarkko@kernel.org> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: van Doorn <leendert@watson.ibm.com> Cc: Dave Safford <safford@watson.ibm.com> Cc: Reiner Sailer <sailer@watson.ibm.com> Cc: Kylene Hall <kjhall@us.ibm.com> Cc: linux-integrity@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/char/tpm/tpm1-cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)