From owner-svn-src-head@FreeBSD.ORG Sat Apr 10 06:55:30 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4971D106564A; Sat, 10 Apr 2010 06:55:30 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2C0568FC08; Sat, 10 Apr 2010 06:55:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3A6tU8l004291; Sat, 10 Apr 2010 06:55:30 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3A6tUEW004289; Sat, 10 Apr 2010 06:55:30 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201004100655.o3A6tUEW004289@svn.freebsd.org> From: Bernhard Schmidt Date: Sat, 10 Apr 2010 06:55:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206443 - head/sys/dev/iwn X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 10 Apr 2010 06:55:30 -0000 Author: bschmidt Date: Sat Apr 10 06:55:29 2010 New Revision: 206443 URL: http://svn.freebsd.org/changeset/base/206443 Log: Small whitespace cleanup. Approved by: rpaulo (mentor) MFC after: 2 weeks Modified: head/sys/dev/iwn/if_iwn.c Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Sat Apr 10 04:47:11 2010 (r206442) +++ head/sys/dev/iwn/if_iwn.c Sat Apr 10 06:55:29 2010 (r206443) @@ -839,7 +839,7 @@ iwn_nic_lock(struct iwn_softc *sc) /* Spin until we actually get the lock. */ for (ntries = 0; ntries < 1000; ntries++) { if ((IWN_READ(sc, IWN_GP_CNTRL) & - (IWN_GP_CNTRL_MAC_ACCESS_ENA | IWN_GP_CNTRL_SLEEP)) == + (IWN_GP_CNTRL_MAC_ACCESS_ENA | IWN_GP_CNTRL_SLEEP)) == IWN_GP_CNTRL_MAC_ACCESS_ENA) return 0; DELAY(10); @@ -1092,8 +1092,7 @@ iwn_dma_contig_alloc(struct iwn_softc *s flags | BUS_DMA_ZERO, &dma->map); if (error != 0) { device_printf(sc->sc_dev, - "%s: bus_dmamem_alloc failed, error %d\n", - __func__, error); + "%s: bus_dmamem_alloc failed, error %d\n", __func__, error); goto fail; } error = bus_dmamap_load(dma->tag, dma->map, dma->vaddr, @@ -1243,7 +1242,7 @@ iwn_alloc_rx_ring(struct iwn_softc *sc, data->m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE); if (data->m == NULL) { device_printf(sc->sc_dev, - "%s: could not allocate rx mbuf\n", __func__); + "%s: could not allocate rx mbuf\n", __func__); error = ENOMEM; goto fail; } @@ -2788,7 +2787,7 @@ iwn5000_reset_sched(struct iwn_softc *sc if (idx < IWN_SCHED_WINSZ) { *(w + IWN_TX_RING_COUNT) = *w; bus_dmamap_sync(sc->sched_dma.tag, sc->sched_dma.map, - BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREWRITE); } } @@ -2996,7 +2995,7 @@ iwn_tx_data(struct iwn_softc *sc, struct if (error != 0) { device_printf(sc->sc_dev, "%s: bus_dmamap_load_mbuf_sg failed, error %d\n", - __func__, error); + __func__, error); m_freem(m); return error; } @@ -3191,7 +3190,7 @@ iwn_tx_data_raw(struct iwn_softc *sc, st if (error != 0) { device_printf(sc->sc_dev, "%s: bus_dmamap_load_mbuf_sg failed, error %d\n", - __func__, error); + __func__, error); m_freem(m); return error; } @@ -4326,7 +4325,7 @@ iwn_tune_sensitivity(struct iwn_softc *s if (calib->cck_state != IWN_CCK_STATE_INIT && (((int32_t)calib->noise_ref - (int32_t)noise_ref) > 2 || - calib->low_fa > 100)) { + calib->low_fa > 100)) { inc(calib->energy_cck, 2, limits->min_energy_cck); dec(calib->cck_x4, 3, limits->min_cck_x4); dec(calib->cck_mrc_x4, 3, limits->min_cck_mrc_x4); @@ -4886,7 +4885,6 @@ iwn_run(struct iwn_softc *sc, struct iee __func__, error); return error; } - /* Configuration has changed, set TX power accordingly. */ error = hal->set_txpower(sc, ni->ni_chan, 1); @@ -5599,7 +5597,7 @@ iwn_read_firmware(struct iwn_softc *sc) if (sc->fw_fp == NULL) { device_printf(sc->sc_dev, "%s: could not load firmare image \"%s\"\n", __func__, - sc->fwname); + sc->fwname); IWN_LOCK(sc); return EINVAL; }