Date: Sat, 23 Dec 2017 12:44:13 -0700 From: Warner Losh <imp@bsdimp.com> To: "Conrad E. Meyer" <cem@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r327084 - head/sys/dev/pccard Message-ID: <CANCZdfrgzApcJCf6nL5%2BAeP8Xfwe9u6mPQ4NTjYe5OqUcK5aKw@mail.gmail.com> In-Reply-To: <CAG6CVpWMHDVSW-jGxHYQcWwB5NNtDevdRzhhXnpC3cKXr2yMtw@mail.gmail.com> References: <201712221659.vBMGxoUH038447@repo.freebsd.org> <CAG6CVpWMHDVSW-jGxHYQcWwB5NNtDevdRzhhXnpC3cKXr2yMtw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Dec 23, 2017 at 12:14 PM, Conrad Meyer <cem@freebsd.org> wrote:
> On Fri, Dec 22, 2017 at 8:59 AM, Warner Losh <imp@freebsd.org> wrote:
> > ...
> > New Revision: 327084
> >
> > PC Card PNP tables are terminated by a NULL sentinel. This shouldn't
> > be recorded in the linker hints, so subtract one to omit it.
> > ============================================================
> ==================
> > --- head/sys/dev/pccard/pccardvar.h Fri Dec 22 16:27:29 2017
> (r327083)
> > +++ head/sys/dev/pccard/pccardvar.h Fri Dec 22 16:59:50 2017
> (r327084)
> > @@ -95,7 +95,7 @@ struct pccard_product {
> > */
> > #define PCCARD_PNP_DESCR "D:#;V32:manufacturer;V32:
> product;Z:cisvendor;Z:cisproduct;"
> > #define PCCARD_PNP_INFO(t) \
> > - MODULE_PNP_INFO(PCCARD_PNP_DESCR, pccard, t, t, sizeof(t[0]),
> sizeof(t) / sizeof(t[0])); \
> > + MODULE_PNP_INFO(PCCARD_PNP_DESCR, pccard, t, t, sizeof(t[0]),
> sizeof(t) / sizeof(t[0]) - 1); \
>
> Perhaps more clearly, this could be:
> MODULE_PNP_INFO(PCCARD_PNP_DESCR, pccard, t, t, sizeof(t[0]), nitems(t) -
> 1)
>
Yup. A later commit did just that when I saw the construct used elsewhere.
Thanks for the suggestion!
Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrgzApcJCf6nL5%2BAeP8Xfwe9u6mPQ4NTjYe5OqUcK5aKw>