Date: Thu, 6 Apr 2017 22:19:48 -0700 From: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: "David E. O'Brien" <obrien@FreeBSD.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r316591 - head/sys/dev/tpm Message-ID: <F4902DBF-9E62-4ED0-8960-851E43F4F745@gmail.com> In-Reply-To: <201704062221.v36MLnr7092648@repo.freebsd.org> References: <201704062221.v36MLnr7092648@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_A80FA18F-487C-487F-808D-46F1C2EF6E78 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Apr 6, 2017, at 15:21, David E. O'Brien <obrien@FreeBSD.org> wrote: >=20 > Author: obrien > Date: Thu Apr 6 22:21:49 2017 > New Revision: 316591 > URL: https://svnweb.freebsd.org/changeset/base/316591 >=20 > Log: > Remove dead code. > The #ifdef __FreeBSD__ section within the OpenBSD tpm_attach() = implementation > can never be active. >=20 > Modified: > head/sys/dev/tpm/tpm.c >=20 > Modified: head/sys/dev/tpm/tpm.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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; > } >=20 > -#ifdef __FreeBSD__ > - sc->sc_suspend =3D 0; > -#else > sc->sc_suspend =3D PWR_RESUME; > sc->sc_powerhook =3D 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 --Apple-Mail=_A80FA18F-487C-487F-808D-46F1C2EF6E78 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJY5yF0AAoJEPWDqSZpMIYV+pQP/RPJj24pi05ZZ6ENnDcpgpqc fEmTpG7cMFG80lPWyDE1WlzbEXkFyT2Ag3/q+1tlJMwMcgWospo3msrcPE/8KxBJ FT303Q4MFpaUecrY6ukbxvoRXJYjwh1USV9h5NixJisqlrKjrnpSt8ijv8w/ObkK RF8kKB2W/ROiNNaA8NR1OqyHmb1X/qfSKD1prkNq/pn3Y7IGjt8GRCk4e94Mfj1y PWOzdkeaNrS3L9+gt4T8Z8e10Oeigeegy8jrxGmMRN+8jNoZlEky6eVbvqG3a5bL Bocf92qnWMCdoRSaAGpafo5NkOWUitab2gONu26Ep2wvsxgKwycu+GJbsWiGpSLL RcQhzr59GTSCnOErHNNV8p7JrGIoqtDvujvjq1Ga+vFhDVI0OQtMnobVDizluUQf Vi9n1lCxNeUKIleRMY8T6ecvbU6zGcPgx/GEVvWLxklmNufoJXiHkAgrsUSCc3Zk H+EkejgUdeaZHm9TDk4kldmyX0JQcW4xB3AFFdpyMFOKTZqbHh/o2cvCB0uef8iV fO4IktwtFMOqGkIyvHxm4KiXuO5Jj1SRjP47zdo/VCPZC4BZAuvs2SfVN6wnn/hv gG/d1X7oJlaLaWba+8kmAc1DbCtCcp16inBsCoDHTQ5rsHRw/KB2dWiEx0LVq+5D A3LVJ0paMBCKolw6CqDZ =bGm3 -----END PGP SIGNATURE----- --Apple-Mail=_A80FA18F-487C-487F-808D-46F1C2EF6E78--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F4902DBF-9E62-4ED0-8960-851E43F4F745>