Re: git: 195402c5c5b7 - main - busdma_bounce: Replace a SYSINIT with static initializations
Date: Tue, 12 Nov 2024 14:29:17 UTC
On Tue, Nov 12, 2024 at 09:12:13AM +0100, Ronald Klop wrote: > Out of curiosity, what is the "why" of this commit? Just to remove unneeded code. All of the required initialization can be done using static definitions, so I wanted to simplify the initialization a bit ahead of https://reviews.freebsd.org/D47521 > Van: Mark Johnston <markj@FreeBSD.org> > Datum: dinsdag, 12 november 2024 03:01 > Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org > Onderwerp: git: 195402c5c5b7 - main - busdma_bounce: Replace a SYSINIT with static initializations > > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=195402c5c5b7b3236c0680f06b60b7f9465982c8 > > > > commit 195402c5c5b7b3236c0680f06b60b7f9465982c8 > > Author: Mark Johnston <markj@FreeBSD.org> > > AuthorDate: 2024-11-12 01:57:35 +0000 > > Commit: Mark Johnston <markj@FreeBSD.org> > > CommitDate: 2024-11-12 01:57:35 +0000 > > > > busdma_bounce: Replace a SYSINIT with static initializations > > No functional change intended. > > MFC after: 1 week > > --- > > sys/kern/subr_busdma_bounce.c | 18 +++++------------- > > 1 file changed, 5 insertions(+), 13 deletions(-) > > > > diff --git a/sys/kern/subr_busdma_bounce.c b/sys/kern/subr_busdma_bounce.c > > index a27bc423c23a..60fe2fc6b2a6 100644 > > --- a/sys/kern/subr_busdma_bounce.c > > +++ b/sys/kern/subr_busdma_bounce.c > > @@ -86,11 +86,14 @@ struct bounce_zone { > > }; > > static struct mtx bounce_lock; > > +MTX_SYSINIT(bounce_lock, &bounce_lock, "bounce pages lock", MTX_DEF); > > static int total_bpages; > > static int busdma_zonecount; > > -static STAILQ_HEAD(, bounce_zone) bounce_zone_list; > > -static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist; > > +static STAILQ_HEAD(, bounce_zone) bounce_zone_list = > > + STAILQ_HEAD_INITIALIZER(bounce_zone_list); > > +static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist = > > + STAILQ_HEAD_INITIALIZER(bounce_map_callbacklist); > > static MALLOC_DEFINE(M_BOUNCE, "bounce", "busdma bounce pages"); > > @@ -130,17 +133,6 @@ _bus_dmamap_reserve_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int flags) > > return (0); > > } > > -static void > > -init_bounce_pages(void *dummy __unused) > > -{ > > - > > - total_bpages = 0; > > - STAILQ_INIT(&bounce_zone_list); > > - STAILQ_INIT(&bounce_map_callbacklist); > > - mtx_init(&bounce_lock, "bounce pages lock", NULL, MTX_DEF); > > -} > > -SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_ANY, init_bounce_pages, NULL); > > - > > static struct sysctl_ctx_list * > > busdma_sysctl_tree(struct bounce_zone *bz) > > { > > > > > > > >