From owner-svn-src-head@freebsd.org Fri Apr 15 14:30:42 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA27BAEDC49; Fri, 15 Apr 2016 14:30:42 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 93B141165; Fri, 15 Apr 2016 14:30:42 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3FEUfX5059360; Fri, 15 Apr 2016 14:30:41 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3FEUeMh059347; Fri, 15 Apr 2016 14:30:40 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604151430.u3FEUeMh059347@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Fri, 15 Apr 2016 14:30:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298055 - in head/sys: arm/arm arm/at91 arm/cavium/cns11xx arm/xscale/ixp425 arm64/arm64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2016 14:30:42 -0000 Author: pfg Date: Fri Apr 15 14:30:40 2016 New Revision: 298055 URL: https://svnweb.freebsd.org/changeset/base/298055 Log: arm: for pointers replace 0 with NULL. These are mostly cosmetical, no functional change. Found with devel/coccinelle. Modified: head/sys/arm/arm/nexus.c head/sys/arm/arm/pmap-v4.c head/sys/arm/arm/pmap-v6.c head/sys/arm/at91/at91_mci.c head/sys/arm/at91/at91_pio.c head/sys/arm/at91/at91_pmc.c head/sys/arm/at91/at91_rtc.c head/sys/arm/at91/at91_ssc.c head/sys/arm/at91/at91_twi.c head/sys/arm/at91/if_ate.c head/sys/arm/cavium/cns11xx/if_ece.c head/sys/arm/xscale/ixp425/ixp425_qmgr.c head/sys/arm64/arm64/nexus.c Modified: head/sys/arm/arm/nexus.c ============================================================================== --- head/sys/arm/arm/nexus.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/arm/nexus.c Fri Apr 15 14:30:40 2016 (r298055) @@ -234,7 +234,7 @@ nexus_alloc_resource(device_t bus, devic } rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == 0) + if (rv == NULL) return (NULL); rman_set_rid(rv, *rid); Modified: head/sys/arm/arm/pmap-v4.c ============================================================================== --- head/sys/arm/arm/pmap-v4.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/arm/pmap-v4.c Fri Apr 15 14:30:40 2016 (r298055) @@ -265,7 +265,7 @@ void (*pmap_copy_page_offs_func)(vm_pad int cnt); void (*pmap_zero_page_func)(vm_paddr_t, int, int); -struct msgbuf *msgbufp = 0; +struct msgbuf *msgbufp = NULL; /* * Crashdump maps. @@ -842,7 +842,7 @@ pmap_alloc_l2_bucket(pmap_t pm, vm_offse ptep = uma_zalloc(l2zone, M_NOWAIT); rw_wlock(&pvh_global_lock); PMAP_LOCK(pm); - if (l2b->l2b_kva != 0) { + if (l2b->l2b_kva != NULL) { /* We lost the race. */ l2->l2_occupancy--; uma_zfree(l2zone, ptep); Modified: head/sys/arm/arm/pmap-v6.c ============================================================================== --- head/sys/arm/arm/pmap-v6.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/arm/pmap-v6.c Fri Apr 15 14:30:40 2016 (r298055) @@ -310,15 +310,15 @@ static pt2_entry_t *CMAP3; static caddr_t CADDR3; caddr_t _tmppt = 0; -struct msgbuf *msgbufp = 0; /* XXX move it to machdep.c */ +struct msgbuf *msgbufp = NULL; /* XXX move it to machdep.c */ /* * Crashdump maps. */ static caddr_t crashdumpmap; -static pt2_entry_t *PMAP1 = 0, *PMAP2; -static pt2_entry_t *PADDR1 = 0, *PADDR2; +static pt2_entry_t *PMAP1 = NULL, *PMAP2; +static pt2_entry_t *PADDR1 = NULL, *PADDR2; #ifdef DDB static pt2_entry_t *PMAP3; static pt2_entry_t *PADDR3; Modified: head/sys/arm/at91/at91_mci.c ============================================================================== --- head/sys/arm/at91/at91_mci.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/at91/at91_mci.c Fri Apr 15 14:30:40 2016 (r298055) @@ -526,16 +526,16 @@ at91_mci_deactivate(device_t dev) sc = device_get_softc(dev); if (sc->intrhand) bus_teardown_intr(dev, sc->irq_res, sc->intrhand); - sc->intrhand = 0; + sc->intrhand = NULL; bus_generic_detach(sc->dev); if (sc->mem_res) bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; + sc->mem_res = NULL; if (sc->irq_res) bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; + sc->irq_res = NULL; return; } Modified: head/sys/arm/at91/at91_pio.c ============================================================================== --- head/sys/arm/at91/at91_pio.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/at91/at91_pio.c Fri Apr 15 14:30:40 2016 (r298055) @@ -240,16 +240,16 @@ at91_pio_deactivate(device_t dev) sc = device_get_softc(dev); if (sc->intrhand) bus_teardown_intr(dev, sc->irq_res, sc->intrhand); - sc->intrhand = 0; + sc->intrhand = NULL; bus_generic_detach(sc->dev); if (sc->mem_res) bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; + sc->mem_res = NULL; if (sc->irq_res) bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; + sc->irq_res = NULL; } static void Modified: head/sys/arm/at91/at91_pmc.c ============================================================================== --- head/sys/arm/at91/at91_pmc.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/at91/at91_pmc.c Fri Apr 15 14:30:40 2016 (r298055) @@ -636,7 +636,7 @@ at91_pmc_deactivate(device_t dev) if (sc->mem_res) bus_release_resource(dev, SYS_RES_IOPORT, rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; + sc->mem_res = NULL; } static int Modified: head/sys/arm/at91/at91_rtc.c ============================================================================== --- head/sys/arm/at91/at91_rtc.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/at91/at91_rtc.c Fri Apr 15 14:30:40 2016 (r298055) @@ -232,18 +232,18 @@ at91_rtc_deactivate(device_t dev) WR4(sc, RTC_IDR, 0xffffffff); if (sc->intrhand) bus_teardown_intr(dev, sc->irq_res, sc->intrhand); - sc->intrhand = 0; + sc->intrhand = NULL; #endif bus_generic_detach(sc->dev); if (sc->mem_res) bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; + sc->mem_res = NULL; #ifdef AT91_RTC_USE_INTERRUPTS if (sc->irq_res) bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; + sc->irq_res = NULL; #endif return; } Modified: head/sys/arm/at91/at91_ssc.c ============================================================================== --- head/sys/arm/at91/at91_ssc.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/at91/at91_ssc.c Fri Apr 15 14:30:40 2016 (r298055) @@ -193,16 +193,16 @@ at91_ssc_deactivate(device_t dev) sc = device_get_softc(dev); if (sc->intrhand) bus_teardown_intr(dev, sc->irq_res, sc->intrhand); - sc->intrhand = 0; + sc->intrhand = NULL; bus_generic_detach(sc->dev); if (sc->mem_res) bus_release_resource(dev, SYS_RES_IOPORT, rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; + sc->mem_res = NULL; if (sc->irq_res) bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; + sc->irq_res = NULL; return; } Modified: head/sys/arm/at91/at91_twi.c ============================================================================== --- head/sys/arm/at91/at91_twi.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/at91/at91_twi.c Fri Apr 15 14:30:40 2016 (r298055) @@ -216,16 +216,16 @@ at91_twi_deactivate(device_t dev) sc = device_get_softc(dev); if (sc->intrhand) bus_teardown_intr(dev, sc->irq_res, sc->intrhand); - sc->intrhand = 0; + sc->intrhand = NULL; bus_generic_detach(sc->dev); if (sc->mem_res) bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; + sc->mem_res = NULL; if (sc->irq_res) bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; + sc->irq_res = NULL; return; } Modified: head/sys/arm/at91/if_ate.c ============================================================================== --- head/sys/arm/at91/if_ate.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/at91/if_ate.c Fri Apr 15 14:30:40 2016 (r298055) @@ -1184,7 +1184,7 @@ atestart_locked(struct ifnet *ifp) } IFQ_DRV_DEQUEUE(&ifp->if_snd, m); - if (m == 0) + if (m == NULL) break; e = bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txhead], m, Modified: head/sys/arm/cavium/cns11xx/if_ece.c ============================================================================== --- head/sys/arm/cavium/cns11xx/if_ece.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/cavium/cns11xx/if_ece.c Fri Apr 15 14:30:40 2016 (r298055) @@ -1064,8 +1064,8 @@ clear_mac_entries(struct ece_softc *ec, struct mac_list * current; char mac[ETHER_ADDR_LEN]; - current = 0; - mac_list_header = 0; + current = NULL; + mac_list_header = NULL; table_end = read_mac_entry(ec, mac, 1); while (!table_end) { @@ -1608,7 +1608,7 @@ ece_encap(struct ece_softc *sc, struct m struct ifnet *ifp; bus_dma_segment_t segs[MAX_FRAGMENT]; bus_dmamap_t mapp; - eth_tx_desc_t *desc = 0; + eth_tx_desc_t *desc = NULL; int csum_flags; int desc_no; int error; Modified: head/sys/arm/xscale/ixp425/ixp425_qmgr.c ============================================================================== --- head/sys/arm/xscale/ixp425/ixp425_qmgr.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm/xscale/ixp425/ixp425_qmgr.c Fri Apr 15 14:30:40 2016 (r298055) @@ -355,7 +355,7 @@ ixpqmgr_qconfig(int qId, int qEntries, i if (cb == NULL) { /* Reset to dummy callback */ qi->cb = dummyCallback; - qi->cbarg = 0; + qi->cbarg = NULL; } else { qi->cb = cb; qi->cbarg = cbarg; Modified: head/sys/arm64/arm64/nexus.c ============================================================================== --- head/sys/arm64/arm64/nexus.c Fri Apr 15 14:28:34 2016 (r298054) +++ head/sys/arm64/arm64/nexus.c Fri Apr 15 14:30:40 2016 (r298055) @@ -250,7 +250,7 @@ nexus_alloc_resource(device_t bus, devic } rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == 0) + if (rv == NULL) return (NULL); rman_set_rid(rv, *rid);