[src/trunk]: src/sys Catch up to recent changes in config_pending_{incr, decr}().

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Catch up to recent changes in config_pending_{incr, decr}().
From: riz <riz%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 01:22:49 +0000
details:   https://anonhg.NetBSD.org/src/rev/fe649faf6714
branches:  trunk
changeset: 790463:fe649faf6714
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Oct 13 06:55:34 2013 +0000

description:
Catch up to recent changes in config_pending_{incr,decr}().

diffstat:

 sys/arch/arm/xscale/pxa2x0_pcic.c          |   8 ++++----
 sys/arch/dreamcast/dev/maple/maple.c       |   8 ++++----
 sys/arch/emips/ebus/ace_ebus.c             |  10 +++++-----
 sys/arch/emips/ebus/flash_ebus.c           |  10 +++++-----
 sys/arch/epoc32/dev/etna.c                 |   8 ++++----
 sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c |   8 ++++----
 sys/arch/i386/pnpbios/pnpbios.c            |   8 ++++----
 sys/arch/xen/xen/xbd_xenbus.c              |   8 ++++----
 sys/arch/xen/xen/xpci_xenbus.c             |   8 ++++----
 sys/arch/xen/xenbus/xenbus_probe.c         |   8 ++++----
 sys/dev/ic/i82365.c                        |   8 ++++----
 11 files changed, 46 insertions(+), 46 deletions(-)

diffs (truncated from 414 to 300 lines):

diff -r ad9506314a7f -r fe649faf6714 sys/arch/arm/xscale/pxa2x0_pcic.c
--- a/sys/arch/arm/xscale/pxa2x0_pcic.c Sun Oct 13 04:24:21 2013 +0000
+++ b/sys/arch/arm/xscale/pxa2x0_pcic.c Sun Oct 13 06:55:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pxa2x0_pcic.c,v 1.11 2012/10/27 17:17:42 chs Exp $     */
+/*     $NetBSD: pxa2x0_pcic.c,v 1.12 2013/10/13 06:55:34 riz Exp $     */
 /*     $OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $    */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.11 2012/10/27 17:17:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.12 2013/10/13 06:55:34 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -417,7 +417,7 @@
        for (i = 0; i < sc->sc_nslots; i++) {
                sock = &sc->sc_socket[s[i]];
 
-               config_pending_incr();
+               config_pending_incr(self);
 
                /* If there's a card there, attach it. */
                cs = (*sock->pcictag->read)(sock, PXAPCIC_CARD_STATUS);
@@ -455,7 +455,7 @@
        u_int cs;
        int present;
 
-       config_pending_decr();
+       config_pending_decr(sock->sc->sc_dev);
 
        while (sock->sc->sc_shutdown == 0) {
                (void) tsleep(sock, PWAIT, "pxapcicev", 0);
diff -r ad9506314a7f -r fe649faf6714 sys/arch/dreamcast/dev/maple/maple.c
--- a/sys/arch/dreamcast/dev/maple/maple.c      Sun Oct 13 04:24:21 2013 +0000
+++ b/sys/arch/dreamcast/dev/maple/maple.c      Sun Oct 13 06:55:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: maple.c,v 1.45 2012/10/27 17:17:44 chs Exp $   */
+/*     $NetBSD: maple.c,v 1.46 2013/10/13 06:55:34 riz Exp $   */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.45 2012/10/27 17:17:44 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.46 2013/10/13 06:55:34 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -242,7 +242,7 @@
        sc->sc_intrhand = sysasic_intr_establish(SYSASIC_EVENT_MAPLE_DMADONE,
            IPL_MAPLE, IRL_MAPLE, maple_intr, sc);
 
-       config_pending_incr();  /* create thread before mounting root */
+       config_pending_incr(self); /* create thread before mounting root */
 
        if (kthread_create(PRI_NONE, 0, NULL, maple_event_thread, sc,
            &sc->event_thread, "%s", device_xname(self)) == 0)
@@ -1428,7 +1428,7 @@
 
        /* OK, continue booting system */
        maple_polling = 0;
-       config_pending_decr();
+       config_pending_decr(sc->sc_dev);
 
        for (;;) {
                /*
diff -r ad9506314a7f -r fe649faf6714 sys/arch/emips/ebus/ace_ebus.c
--- a/sys/arch/emips/ebus/ace_ebus.c    Sun Oct 13 04:24:21 2013 +0000
+++ b/sys/arch/emips/ebus/ace_ebus.c    Sun Oct 13 06:55:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ace_ebus.c,v 1.7 2013/06/03 20:26:31 christos Exp $    */
+/*     $NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.7 2013/06/03 20:26:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -242,7 +242,7 @@
        ebus_intr_establish(parent, (void*)ia->ia_cookie, IPL_BIO,
            ace_ebus_intr, ace);
 
-       config_pending_incr();
+       config_pending_incr(self);
 
        error = kthread_create(PRI_NONE, 0, NULL, sysace_thread,
            ace, NULL, "%s", device_xname(ace->sc_dev));
@@ -348,7 +348,7 @@
        dkwedge_autodiscover = 1;
        dkwedge_discover(&sc->sc_dk);
 
-       config_pending_decr();
+       config_pending_decr(sc->sc_dev);
 
        DBGME(DEBUG_STATUS, printf("Sysace::thread done for %p\n", sc));
        kthread_exit(0);
@@ -1462,7 +1462,7 @@
  * Rest of code lifted with mods from the dev\ata\wd.c driver
  */
 
-/*     $NetBSD: ace_ebus.c,v 1.7 2013/06/03 20:26:31 christos Exp $ */
+/*     $NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
diff -r ad9506314a7f -r fe649faf6714 sys/arch/emips/ebus/flash_ebus.c
--- a/sys/arch/emips/ebus/flash_ebus.c  Sun Oct 13 04:24:21 2013 +0000
+++ b/sys/arch/emips/ebus/flash_ebus.c  Sun Oct 13 06:55:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: flash_ebus.c,v 1.6 2013/05/29 00:47:48 christos Exp $  */
+/*     $NetBSD: flash_ebus.c,v 1.7 2013/10/13 06:55:34 riz Exp $       */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.6 2013/05/29 00:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.7 2013/10/13 06:55:34 riz Exp $");
 
 /* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
  * Extended to include the Intel JS28F256P30T95.
@@ -295,7 +295,7 @@
                sc->sc_type.ft_manuf_code, sc->sc_type.ft_device_code);
     }
 
-    config_pending_incr();
+    config_pending_incr(self);
 
        error = kthread_create(PRI_NONE, 0, NULL,
            eflash_thread, sc, NULL, "%s", device_xname(sc->sc_dev));
@@ -1302,7 +1302,7 @@
 /* Rest of code lifted with mods from the dev\ata\wd.c driver
  */
 
-/*     $NetBSD: flash_ebus.c,v 1.6 2013/05/29 00:47:48 christos Exp $ */
+/*     $NetBSD: flash_ebus.c,v 1.7 2013/10/13 06:55:34 riz Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -1537,7 +1537,7 @@
     dkwedge_autodiscover = 1;
        dkwedge_discover(&sc->sc_dk);
 
-    config_pending_decr();
+    config_pending_decr(sc->sc_dev);
 
     DBGME(DEBUG_STATUS,printf("%s: wedges thread done for %p\n", device_xname(sc->sc_dev), sc));
        kthread_exit(0);
diff -r ad9506314a7f -r fe649faf6714 sys/arch/epoc32/dev/etna.c
--- a/sys/arch/epoc32/dev/etna.c        Sun Oct 13 04:24:21 2013 +0000
+++ b/sys/arch/epoc32/dev/etna.c        Sun Oct 13 06:55:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: etna.c,v 1.2 2013/06/22 13:36:16 kiyohara Exp $        */
+/*     $NetBSD: etna.c,v 1.3 2013/10/13 06:55:34 riz Exp $     */
 /*
  * Copyright (c) 2012 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: etna.c,v 1.2 2013/06/22 13:36:16 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: etna.c,v 1.3 2013/10/13 06:55:34 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -226,7 +226,7 @@
        struct etna_softc *sc = device_private(self);
        int status;
 
-       config_pending_incr();
+       config_pending_incr(self);
 
        status = bus_space_read_1(sc->sc_iot, sc->sc_ioh, ETNA_SKT_STATUS);
        if ((status & SKT_CARD_OUT) != SKT_CARD_OUT)
@@ -242,7 +242,7 @@
 {
        struct etna_softc *sc = arg;
 
-       config_pending_decr();
+       config_pending_decr(sc->sc_dev);
 
 //     while (1) {
 //     }
diff -r ad9506314a7f -r fe649faf6714 sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c        Sun Oct 13 04:24:21 2013 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c        Sun Oct 13 06:55:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461pcmcia.c,v 1.49 2011/07/26 22:52:48 dyoung Exp $        */
+/*     $NetBSD: hd64461pcmcia.c,v 1.50 2013/10/13 06:55:34 riz Exp $   */
 
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.49 2011/07/26 22:52:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.50 2013/10/13 06:55:34 riz Exp $");
 
 #include "opt_hd64461pcmcia.h"
 
@@ -273,7 +273,7 @@
                               "%s", device_xname(self));
        KASSERT(error == 0);
 
-       config_pending_incr();
+       config_pending_incr(self);
 
        /* XXX: TODO */
        if (!pmf_device_register(self, NULL, NULL))
@@ -294,7 +294,7 @@
        hd64461pcmcia_attach_channel(sc, CHANNEL_1);
        hd64461pcmcia_attach_channel(sc, CHANNEL_0);
 #endif
-       config_pending_decr();
+       config_pending_decr(sc->sc_dev);
 
        while (!sc->sc_shutdown) {
                tsleep(sc, PWAIT, "CSC wait", 0);
diff -r ad9506314a7f -r fe649faf6714 sys/arch/i386/pnpbios/pnpbios.c
--- a/sys/arch/i386/pnpbios/pnpbios.c   Sun Oct 13 04:24:21 2013 +0000
+++ b/sys/arch/i386/pnpbios/pnpbios.c   Sun Oct 13 06:55:34 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbios.c,v 1.71 2011/06/30 20:09:31 wiz Exp $ */
+/* $NetBSD: pnpbios.c,v 1.72 2013/10/13 06:55:34 riz Exp $ */
 
 /*
  * Copyright (c) 2000 Jason R. Thorpe.  All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.71 2011/06/30 20:09:31 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.72 2013/10/13 06:55:34 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -369,7 +369,7 @@
        if (evtype != PNP_IC_CONTROL_EVENT_NONE) {
                if (evtype != PNP_IC_CONTROL_EVENT_POLL || sc->sc_evaddr) {
                        sc->sc_threadrun = 1;
-                       config_pending_incr();
+                       config_pending_incr(sc->sc_dev);
                        if (kthread_create(PRI_NONE, 0, NULL,
                            pnpbios_event_thread, sc, &sc->sc_evthread,
                            "%s", device_xname(self)))
@@ -1412,7 +1412,7 @@
                EDPRINTF(("pnpbios: os active returns 0x%02x\n", rv));
        }
 
-       config_pending_decr();
+       config_pending_decr(sc->sc_dev);
 
        goto start;
        while (sc->sc_threadrun) {
diff -r ad9506314a7f -r fe649faf6714 sys/arch/xen/xen/xbd_xenbus.c
--- a/sys/arch/xen/xen/xbd_xenbus.c     Sun Oct 13 04:24:21 2013 +0000
+++ b/sys/arch/xen/xen/xbd_xenbus.c     Sun Oct 13 06:55:34 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xbd_xenbus.c,v 1.59 2013/05/29 23:11:56 christos Exp $      */
+/*      $NetBSD: xbd_xenbus.c,v 1.60 2013/10/13 06:55:34 riz Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.59 2013/05/29 23:11:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.60 2013/10/13 06:55:34 riz Exp $");
 
 #include "opt_xen.h"
 
@@ -246,7 +246,7 @@
        int err;
 #endif
 
-       config_pending_incr();
+       config_pending_incr(self);
        aprint_normal(": Xen Virtual Block Device Interface\n");
 
        dk_sc_init(&sc->sc_dksc, device_xname(self));
@@ -581,7 +581,7 @@
                disk_set_info(sc->sc_dksc.sc_dev, &sc->sc_dksc.sc_dkdev, NULL);
Prev by Date: [src/trunk]: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm Print the cl...
Next by Date: [src/trunk]: src/share/man/man4 add u3g
Previous by Thread: [src/trunk]: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm Print the cl...
Next by Thread: [src/trunk]: src/share/man/man4 add u3g
Indexes:
Home | Main Index | Thread Index | Old Index