> On Apr 6, 2017, at 15:21, David E. O'Brien <obr...@freebsd.org> wrote: > > Author: obrien > Date: Thu Apr 6 22:21:49 2017 > New Revision: 316591 > URL: https://svnweb.freebsd.org/changeset/base/316591 > > Log: > Remove dead code. > The #ifdef __FreeBSD__ section within the OpenBSD tpm_attach() implementation > can never be active. > > Modified: > head/sys/dev/tpm/tpm.c > > Modified: head/sys/dev/tpm/tpm.c > ============================================================================== > --- head/sys/dev/tpm/tpm.c Thu Apr 6 20:12:39 2017 (r316590) > +++ head/sys/dev/tpm/tpm.c Thu Apr 6 22:21:49 2017 (r316591) > @@ -422,12 +422,8 @@ tpm_attach(device_t parent, device_t sel > return; > } > > -#ifdef __FreeBSD__ > - sc->sc_suspend = 0; > -#else > sc->sc_suspend = PWR_RESUME; > sc->sc_powerhook = powerhook_establish(tpm_powerhook, sc); > -#endif > } > #endif
Hi David,
I think you meant to delete the other piece of code (__FreeBSD__ is
always defined).
Also, why delete lines that might make it harder to backport changes
from OpenBSD?
Thanks,
-Ngie
signature.asc
Description: Message signed with OpenPGP using GPGMail
