Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci remove trailing whitespace
details: https://anonhg.NetBSD.org/src/rev/e76e728248f5
branches: trunk
changeset: 785800:e76e728248f5
user: christos <christos%NetBSD.org@localhost>
date: Sat Mar 30 03:21:02 2013 +0000
description:
remove trailing whitespace
diffstat:
sys/dev/pci/if_age.c | 106 ++++++++++++++--------------
sys/dev/pci/if_alc.c | 76 ++++++++++----------
sys/dev/pci/if_ale.c | 38 +++++-----
sys/dev/pci/if_ath_pci.c | 6 +-
sys/dev/pci/if_bge.c | 12 +-
sys/dev/pci/if_bnx.c | 172 +++++++++++++++++++++++-----------------------
sys/dev/pci/if_bwi_pci.c | 6 +-
sys/dev/pci/if_cas.c | 14 +-
sys/dev/pci/if_de.c | 6 +-
sys/dev/pci/if_et.c | 26 +++---
sys/dev/pci/if_ex_pci.c | 6 +-
sys/dev/pci/if_fxp_pci.c | 8 +-
sys/dev/pci/if_gem_pci.c | 6 +-
sys/dev/pci/if_iwi.c | 14 +-
sys/dev/pci/if_iwn.c | 12 +-
sys/dev/pci/if_jme.c | 8 +-
sys/dev/pci/if_kse.c | 10 +-
sys/dev/pci/if_lii.c | 6 +-
sys/dev/pci/if_lmc.c | 10 +-
sys/dev/pci/if_malo_pci.c | 12 +-
sys/dev/pci/if_msk.c | 36 ++++----
sys/dev/pci/if_nfe.c | 6 +-
sys/dev/pci/if_pcn.c | 12 +-
sys/dev/pci/if_re_pci.c | 6 +-
sys/dev/pci/if_rtk_pci.c | 6 +-
sys/dev/pci/if_sip.c | 8 +-
sys/dev/pci/if_sk.c | 8 +-
sys/dev/pci/if_stge.c | 6 +-
sys/dev/pci/if_tl.c | 6 +-
sys/dev/pci/if_vge.c | 8 +-
sys/dev/pci/if_vioif.c | 14 +-
sys/dev/pci/if_vte.c | 22 ++--
sys/dev/pci/if_wm.c | 66 ++++++++--------
sys/dev/pci/if_wpi.c | 58 +++++++-------
sys/dev/pci/if_xge.c | 32 ++++----
35 files changed, 424 insertions(+), 424 deletions(-)
diffs (truncated from 3319 to 300 lines):
diff -r 2c27c61fab71 -r e76e728248f5 sys/dev/pci/if_age.c
--- a/sys/dev/pci/if_age.c Sat Mar 30 03:17:33 2013 +0000
+++ b/sys/dev/pci/if_age.c Sat Mar 30 03:21:02 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.41 2012/07/22 14:33:00 matt Exp $ */
+/* $NetBSD: if_age.c,v 1.42 2013/03/30 03:21:02 christos Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.41 2012/07/22 14:33:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.42 2013/03/30 03:21:02 christos Exp $");
#include "vlan.h"
@@ -208,7 +208,7 @@
/* Get PCI and chip id/revision. */
sc->age_rev = PCI_REVISION(pa->pa_class);
- sc->age_chip_rev = CSR_READ_4(sc, AGE_MASTER_CFG) >>
+ sc->age_chip_rev = CSR_READ_4(sc, AGE_MASTER_CFG) >>
MASTER_CHIP_REV_SHIFT;
aprint_debug_dev(self, "PCI device revision : 0x%04x\n", sc->age_rev);
@@ -485,7 +485,7 @@
struct ifnet *ifp = &sc->sc_ec.ec_if;
struct cmb *cmb;
uint32_t status;
-
+
status = CSR_READ_4(sc, AGE_INTR_STATUS);
if (status == 0 || (status & AGE_INTRS) == 0)
return 0;
@@ -579,11 +579,11 @@
break;
}
if (i == 0)
- printf("%s: reloading EEPROM timeout!\n",
- device_xname(sc->sc_dev));
+ printf("%s: reloading EEPROM timeout!\n",
+ device_xname(sc->sc_dev));
} else {
if (agedebug)
- printf("%s: PCI VPD capability not found!\n",
+ printf("%s: PCI VPD capability not found!\n",
device_xname(sc->sc_dev));
}
@@ -686,7 +686,7 @@
/*
* Create DMA stuffs for TX ring
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_TX_RING_SZ, 1,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_TX_RING_SZ, 1,
AGE_TX_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->age_cdata.age_tx_ring_map);
if (error) {
sc->age_cdata.age_tx_ring_map = NULL;
@@ -694,8 +694,8 @@
}
/* Allocate DMA'able memory for TX ring */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_TX_RING_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_tx_ring_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_TX_RING_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_tx_ring_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for Tx ring, "
@@ -706,7 +706,7 @@
error = bus_dmamem_map(sc->sc_dmat, &sc->age_rdata.age_tx_ring_seg,
nsegs, AGE_TX_RING_SZ, (void **)&sc->age_rdata.age_tx_ring,
BUS_DMA_NOWAIT | BUS_DMA_COHERENT);
- if (error)
+ if (error)
return ENOBUFS;
memset(sc->age_rdata.age_tx_ring, 0, AGE_TX_RING_SZ);
@@ -717,18 +717,18 @@
if (error) {
printf("%s: could not load DMA'able memory for Tx ring, "
"error = %i\n", device_xname(sc->sc_dev), error);
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->age_rdata.age_tx_ring_seg, 1);
return error;
}
- sc->age_rdata.age_tx_ring_paddr =
+ sc->age_rdata.age_tx_ring_paddr =
sc->age_cdata.age_tx_ring_map->dm_segs[0].ds_addr;
/*
* Create DMA stuffs for RX ring
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_RX_RING_SZ, 1,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_RX_RING_SZ, 1,
AGE_RX_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->age_cdata.age_rx_ring_map);
if (error) {
sc->age_cdata.age_rx_ring_map = NULL;
@@ -736,8 +736,8 @@
}
/* Allocate DMA'able memory for RX ring */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_RX_RING_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_rx_ring_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_RX_RING_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_rx_ring_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for Rx ring, "
@@ -764,13 +764,13 @@
return error;
}
- sc->age_rdata.age_rx_ring_paddr =
+ sc->age_rdata.age_rx_ring_paddr =
sc->age_cdata.age_rx_ring_map->dm_segs[0].ds_addr;
/*
* Create DMA stuffs for RX return ring
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_RR_RING_SZ, 1,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_RR_RING_SZ, 1,
AGE_RR_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->age_cdata.age_rr_ring_map);
if (error) {
sc->age_cdata.age_rr_ring_map = NULL;
@@ -778,8 +778,8 @@
}
/* Allocate DMA'able memory for RX return ring */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_RR_RING_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_rr_ring_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_RR_RING_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_rr_ring_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for Rx "
@@ -807,14 +807,14 @@
return error;
}
- sc->age_rdata.age_rr_ring_paddr =
+ sc->age_rdata.age_rr_ring_paddr =
sc->age_cdata.age_rr_ring_map->dm_segs[0].ds_addr;
/*
- * Create DMA stuffs for CMB block
+ * Create DMA stuffs for CMB block
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_CMB_BLOCK_SZ, 1,
- AGE_CMB_BLOCK_SZ, 0, BUS_DMA_NOWAIT,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_CMB_BLOCK_SZ, 1,
+ AGE_CMB_BLOCK_SZ, 0, BUS_DMA_NOWAIT,
&sc->age_cdata.age_cmb_block_map);
if (error) {
sc->age_cdata.age_cmb_block_map = NULL;
@@ -822,8 +822,8 @@
}
/* Allocate DMA'able memory for CMB block */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_CMB_BLOCK_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_cmb_block_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_CMB_BLOCK_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_cmb_block_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for "
@@ -841,7 +841,7 @@
/* Load the DMA map for CMB block. */
error = bus_dmamap_load(sc->sc_dmat, sc->age_cdata.age_cmb_block_map,
- sc->age_rdata.age_cmb_block, AGE_CMB_BLOCK_SZ, NULL,
+ sc->age_rdata.age_cmb_block, AGE_CMB_BLOCK_SZ, NULL,
BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not load DMA'able memory for CMB block, "
@@ -851,14 +851,14 @@
return error;
}
- sc->age_rdata.age_cmb_block_paddr =
+ sc->age_rdata.age_cmb_block_paddr =
sc->age_cdata.age_cmb_block_map->dm_segs[0].ds_addr;
/*
* Create DMA stuffs for SMB block
*/
- error = bus_dmamap_create(sc->sc_dmat, AGE_SMB_BLOCK_SZ, 1,
- AGE_SMB_BLOCK_SZ, 0, BUS_DMA_NOWAIT,
+ error = bus_dmamap_create(sc->sc_dmat, AGE_SMB_BLOCK_SZ, 1,
+ AGE_SMB_BLOCK_SZ, 0, BUS_DMA_NOWAIT,
&sc->age_cdata.age_smb_block_map);
if (error) {
sc->age_cdata.age_smb_block_map = NULL;
@@ -866,8 +866,8 @@
}
/* Allocate DMA'able memory for SMB block */
- error = bus_dmamem_alloc(sc->sc_dmat, AGE_SMB_BLOCK_SZ,
- ETHER_ALIGN, 0, &sc->age_rdata.age_smb_block_seg, 1,
+ error = bus_dmamem_alloc(sc->sc_dmat, AGE_SMB_BLOCK_SZ,
+ ETHER_ALIGN, 0, &sc->age_rdata.age_smb_block_seg, 1,
&nsegs, BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not allocate DMA'able memory for "
@@ -885,7 +885,7 @@
/* Load the DMA map for SMB block */
error = bus_dmamap_load(sc->sc_dmat, sc->age_cdata.age_smb_block_map,
- sc->age_rdata.age_smb_block, AGE_SMB_BLOCK_SZ, NULL,
+ sc->age_rdata.age_smb_block, AGE_SMB_BLOCK_SZ, NULL,
BUS_DMA_NOWAIT);
if (error) {
printf("%s: could not load DMA'able memory for SMB block, "
@@ -895,7 +895,7 @@
return error;
}
- sc->age_rdata.age_smb_block_paddr =
+ sc->age_rdata.age_smb_block_paddr =
sc->age_cdata.age_smb_block_map->dm_segs[0].ds_addr;
/* Create DMA maps for Tx buffers. */
@@ -919,7 +919,7 @@
BUS_DMA_NOWAIT, &sc->age_cdata.age_rx_sparemap);
if (error) {
sc->age_cdata.age_rx_sparemap = NULL;
- printf("%s: could not create spare Rx dmamap, error = %i.\n",
+ printf("%s: could not create spare Rx dmamap, error = %i.\n",
device_xname(sc->sc_dev), error);
return error;
}
@@ -979,11 +979,11 @@
sc->age_cdata.age_tx_ring_map = NULL;
/* Rx ring. */
- if (sc->age_cdata.age_rx_ring_map != NULL)
+ if (sc->age_cdata.age_rx_ring_map != NULL)
bus_dmamap_unload(sc->sc_dmat, sc->age_cdata.age_rx_ring_map);
if (sc->age_cdata.age_rx_ring_map != NULL &&
sc->age_rdata.age_rx_ring != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->age_rdata.age_rx_ring_seg, 1);
sc->age_rdata.age_rx_ring = NULL;
sc->age_cdata.age_rx_ring_map = NULL;
@@ -993,7 +993,7 @@
bus_dmamap_unload(sc->sc_dmat, sc->age_cdata.age_rr_ring_map);
if (sc->age_cdata.age_rr_ring_map != NULL &&
sc->age_rdata.age_rr_ring != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->age_rdata.age_rr_ring_seg, 1);
sc->age_rdata.age_rr_ring = NULL;
sc->age_cdata.age_rr_ring_map = NULL;
@@ -1013,7 +1013,7 @@
bus_dmamap_unload(sc->sc_dmat, sc->age_cdata.age_smb_block_map);
if (sc->age_cdata.age_smb_block_map != NULL &&
sc->age_rdata.age_smb_block != NULL)
- bus_dmamem_free(sc->sc_dmat,
+ bus_dmamem_free(sc->sc_dmat,
&sc->age_rdata.age_smb_block_seg, 1);
sc->age_rdata.age_smb_block = NULL;
sc->age_cdata.age_smb_block_map = NULL;
@@ -1094,18 +1094,18 @@
age_start(ifp);
}
-static bool
-age_shutdown(device_t self, int howto)
+static bool
+age_shutdown(device_t self, int howto)
{
struct age_softc *sc;
struct ifnet *ifp;
sc = device_private(self);
ifp = &sc->sc_ec.ec_if;
- age_stop(ifp, 1);
+ age_stop(ifp, 1);
return true;
-}
+}
static int
@@ -1210,7 +1210,7 @@
*m_head = m_pullup(*m_head, MHLEN);
if (*m_head == NULL) {
- printf("%s: can't defrag TX mbuf\n",
+ printf("%s: can't defrag TX mbuf\n",
device_xname(sc->sc_dev));
return ENOBUFS;
}
@@ -1272,13 +1272,13 @@
Home |
Main Index |
Thread Index |
Old Index