On Thu, Aug 24, 2017 at 10:37:13AM +0200, Alexander Steffen wrote: > The auto_startup functions for TPM1 and TPM2 convert all TPM error codes to > ENODEV on exit. But since there is only one caller for those functions, > this code can be consolidated within the caller. Additionally, this allows > the caller to distinguish between a TPM being present (but returning error > responses for some commands) and no TPM being present (or the TPM > malfunctioning completely). > > Signed-off-by: Alexander Steffen <alexander.stef...@infineon.com> > --- > drivers/char/tpm/tpm-chip.c | 4 +++- > drivers/char/tpm/tpm-interface.c | 6 ++---- > drivers/char/tpm/tpm2-cmd.c | 5 ++--- > 3 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c > index a353b7a..f20fcb7 100644 > --- a/drivers/char/tpm/tpm-chip.c > +++ b/drivers/char/tpm/tpm-chip.c > @@ -404,8 +404,10 @@ int tpm_chip_register(struct tpm_chip *chip) > rc = tpm2_auto_startup(chip); > else > rc = tpm1_auto_startup(chip); > - if (rc) > + if (rc < 0) > return rc; > + else if (rc > 0) > + return -ENODEV;
So what good this change makes in the end? I'm not sure I'm following. > } > > tpm_sysfs_add_device(chip); > diff --git a/drivers/char/tpm/tpm-interface.c > b/drivers/char/tpm/tpm-interface.c > index 78fb41d..fe11f2a 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -1000,7 +1000,8 @@ EXPORT_SYMBOL_GPL(tpm_do_selftest); > * sequence > * @chip: TPM chip to use > * > - * Returns 0 on success, < 0 in case of fatal error. > + * Returns 0 on success, < 0 in case of fatal error or a value > 0 > representing > + * a TPM error code. > */ A nitpick. According to https://www.kernel.org/doc/Documentation/kernel-doc-nano-HOWTO.txt you ought to use "Return:" keyword ;-) I would favor here: "Return: same as with tpm_transmit_cmd()" > int tpm1_auto_startup(struct tpm_chip *chip) > { > @@ -1015,10 +1016,7 @@ int tpm1_auto_startup(struct tpm_chip *chip) > goto out; > } > > - return rc; > out: > - if (rc > 0) > - rc = -ENODEV; > return rc; > } > > diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c > index e1a41b7..54a3123 100644 > --- a/drivers/char/tpm/tpm2-cmd.c > +++ b/drivers/char/tpm/tpm2-cmd.c > @@ -1074,7 +1074,8 @@ static int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip) > * sequence > * @chip: TPM chip to use > * > - * Returns 0 on success, < 0 in case of fatal error. > + * Returns 0 on success, < 0 in case of fatal error or a value > 0 > representing > + * a TPM error code. > */ > int tpm2_auto_startup(struct tpm_chip *chip) > { > @@ -1109,8 +1110,6 @@ int tpm2_auto_startup(struct tpm_chip *chip) > rc = tpm2_get_cc_attrs_tbl(chip); > > out: > - if (rc > 0) > - rc = -ENODEV; > return rc; > } > > -- > 2.7.4 > At this point I can only see aero improvement how the driver works and a very minor clean up. /Jarkko ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ tpmdd-devel mailing list tpmdd-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tpmdd-devel
