Date: Fri, 14 Dec 2018 23:23:35 +0100 From: Marcin Wojtas <mw@semihalf.com> To: jhb@freebsd.org Cc: Marcin Wojtas <mw@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r342085 - head/sys/dev/tpm Message-ID: <CAPv3WKcQdDueAB=SKqzkaMhZaheA6jcjeFc63A0eDQHviGR3yw@mail.gmail.com> In-Reply-To: <aac5cbc2-5bc5-a738-0e76-6cf58d281dfb@FreeBSD.org> References: <201812141743.wBEHhZar096560@repo.freebsd.org> <aac5cbc2-5bc5-a738-0e76-6cf58d281dfb@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi John, pt., 14 gru 2018 o 18:57 John Baldwin <jhb@freebsd.org> napisa=C5=82(a): > > On 12/14/18 9:43 AM, Marcin Wojtas wrote: > > Author: mw > > Date: Fri Dec 14 17:43:35 2018 > > New Revision: 342085 > > URL: https://svnweb.freebsd.org/changeset/base/342085 > > > > Log: > > Fix TPM driver compilation from r342084 > > > > Include recent ACPI_ID_PROBE API change. > > > > Modified: > > head/sys/dev/tpm/tpm_crb.c > > head/sys/dev/tpm/tpm_tis.c > > > > Modified: head/sys/dev/tpm/tpm_crb.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_crb.c Fri Dec 14 16:14:36 2018 (= r342084) > > +++ head/sys/dev/tpm/tpm_crb.c Fri Dec 14 17:43:35 2018 (= r342085) > > @@ -107,7 +107,7 @@ tpmcrb_acpi_probe(device_t dev) > > int rid =3D 0; > > uint32_t caps; > > > > - if (ACPI_ID_PROBE(device_get_parent(dev), dev, tpmcrb_ids) =3D=3D= NULL) > > + if (ACPI_ID_PROBE(device_get_parent(dev), dev, tpmcrb_ids, NULL) = =3D=3D NULL) > > return (ENXIO); > > I think it doesn't return a pointer anymore either. I think you want to = use > its return value as the return value from probe to honor the relative pri= ority > of CID vs HID matches, so something like: > > int error; > > error =3D ACPI_ID_PROBE(...); > if (error > 0) > return (error); > > ... > > return (error); > > Instead of 'return (BUS_GENERIC_PROBE)' or some such. > Thank you for pointing this, I addressed your remark in r342104. Best regards, Marcin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPv3WKcQdDueAB=SKqzkaMhZaheA6jcjeFc63A0eDQHviGR3yw>