Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Sep 2020 22:04:37 +0000 (UTC)
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r365195 - head/sys/dev/nfe
Message-ID:  <202009012204.081M4bDk055261@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mjg
Date: Tue Sep  1 22:04:37 2020
New Revision: 365195
URL: https://svnweb.freebsd.org/changeset/base/365195

Log:
  nfe: clean up empty lines in .c and .h files

Modified:
  head/sys/dev/nfe/if_nfe.c

Modified: head/sys/dev/nfe/if_nfe.c
==============================================================================
--- head/sys/dev/nfe/if_nfe.c	Tue Sep  1 22:04:24 2020	(r365194)
+++ head/sys/dev/nfe/if_nfe.c	Tue Sep  1 22:04:37 2020	(r365195)
@@ -270,7 +270,6 @@ static struct nfe_type nfe_devs[] = {
 	{0, 0, NULL}
 };
 
-
 /* Probe for supported hardware ID's */
 static int
 nfe_probe(device_t dev)
@@ -337,7 +336,6 @@ nfe_alloc_msix(struct nfe_softc *sc, int count)
 	}
 }
 
-
 static int
 nfe_detect_msik9(struct nfe_softc *sc)
 {
@@ -361,7 +359,6 @@ nfe_detect_msik9(struct nfe_softc *sc)
 	return (found);
 }
 
-
 static int
 nfe_attach(device_t dev)
 {
@@ -604,7 +601,6 @@ nfe_attach(device_t dev)
 	if_setsendqlen(ifp, NFE_TX_RING_COUNT - 1);
 	if_setsendqready(ifp);
 
-
 	if (sc->nfe_flags & NFE_HW_CSUM) {
 		if_setcapabilitiesbit(ifp, IFCAP_HWCSUM | IFCAP_TSO4, 0);
 		if_sethwassistbits(ifp, NFE_CSUM_FEATURES | CSUM_TSO, 0);
@@ -688,7 +684,6 @@ fail:
 	return (error);
 }
 
-
 static int
 nfe_detach(device_t dev)
 {
@@ -786,7 +781,6 @@ nfe_detach(device_t dev)
 	return (0);
 }
 
-
 static int
 nfe_suspend(device_t dev)
 {
@@ -803,7 +797,6 @@ nfe_suspend(device_t dev)
 	return (0);
 }
 
-
 static int
 nfe_resume(device_t dev)
 {
@@ -823,7 +816,6 @@ nfe_resume(device_t dev)
 	return (0);
 }
 
-
 static int
 nfe_can_use_msix(struct nfe_softc *sc)
 {
@@ -865,7 +857,6 @@ nfe_can_use_msix(struct nfe_softc *sc)
 	return (use_msix);
 }
 
-
 /* Take PHY/NIC out of powerdown, from Linux */
 static void
 nfe_power(struct nfe_softc *sc)
@@ -889,7 +880,6 @@ nfe_power(struct nfe_softc *sc)
 	NFE_WRITE(sc, NFE_PWR2_CTL, pwr);
 }
 
-
 static void
 nfe_miibus_statchg(device_t dev)
 {
@@ -931,7 +921,6 @@ nfe_miibus_statchg(device_t dev)
 	NFE_WRITE(sc, NFE_RX_CTL, rxctl);
 }
 
-
 static void
 nfe_mac_config(struct nfe_softc *sc, struct mii_data *mii)
 {
@@ -1024,7 +1013,6 @@ nfe_mac_config(struct nfe_softc *sc, struct mii_data *
 	}
 }
 
-
 static int
 nfe_miibus_readreg(device_t dev, int phy, int reg)
 {
@@ -1065,7 +1053,6 @@ nfe_miibus_readreg(device_t dev, int phy, int reg)
 	return (val);
 }
 
-
 static int
 nfe_miibus_writereg(device_t dev, int phy, int reg, int val)
 {
@@ -1197,7 +1184,6 @@ fail:
 	return (error);
 }
 
-
 static void
 nfe_alloc_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring)
 {
@@ -1317,7 +1303,6 @@ fail:
 	sc->nfe_jumbo_disable = 1;
 }
 
-
 static int
 nfe_init_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring)
 {
@@ -1345,7 +1330,6 @@ nfe_init_rx_ring(struct nfe_softc *sc, struct nfe_rx_r
 	return (0);
 }
 
-
 static int
 nfe_init_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring)
 {
@@ -1373,7 +1357,6 @@ nfe_init_jrx_ring(struct nfe_softc *sc, struct nfe_jrx
 	return (0);
 }
 
-
 static void
 nfe_free_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring)
 {
@@ -1420,7 +1403,6 @@ nfe_free_rx_ring(struct nfe_softc *sc, struct nfe_rx_r
 	}
 }
 
-
 static void
 nfe_free_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring)
 {
@@ -1474,7 +1456,6 @@ nfe_free_jrx_ring(struct nfe_softc *sc, struct nfe_jrx
 	}
 }
 
-
 static int
 nfe_alloc_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
 {
@@ -1559,7 +1540,6 @@ fail:
 	return (error);
 }
 
-
 static void
 nfe_init_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
 {
@@ -1582,7 +1562,6 @@ nfe_init_tx_ring(struct nfe_softc *sc, struct nfe_tx_r
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 }
 
-
 static void
 nfe_free_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
 {
@@ -1635,7 +1614,6 @@ nfe_free_tx_ring(struct nfe_softc *sc, struct nfe_tx_r
 #ifdef DEVICE_POLLING
 static poll_handler_t nfe_poll;
 
-
 static int
 nfe_poll(if_t ifp, enum poll_cmd cmd, int count)
 {
@@ -1684,7 +1662,6 @@ nfe_set_intr(struct nfe_softc *sc)
 		NFE_WRITE(sc, NFE_IRQ_MASK, NFE_IRQ_WANTED);
 }
 
-
 /* In MSIX, a write to mask reegisters behaves as XOR. */
 static __inline void
 nfe_enable_intr(struct nfe_softc *sc)
@@ -1698,7 +1675,6 @@ nfe_enable_intr(struct nfe_softc *sc)
 		NFE_WRITE(sc, sc->nfe_irq_mask, sc->nfe_intrs);
 }
 
-
 static __inline void
 nfe_disable_intr(struct nfe_softc *sc)
 {
@@ -1711,7 +1687,6 @@ nfe_disable_intr(struct nfe_softc *sc)
 		NFE_WRITE(sc, sc->nfe_irq_mask, sc->nfe_nointrs);
 }
 
-
 static int
 nfe_ioctl(if_t ifp, u_long cmd, caddr_t data)
 {
@@ -1863,7 +1838,6 @@ nfe_ioctl(if_t ifp, u_long cmd, caddr_t data)
 	return (error);
 }
 
-
 static int
 nfe_intr(void *arg)
 {
@@ -1881,7 +1855,6 @@ nfe_intr(void *arg)
 	return (FILTER_HANDLED);
 }
 
-
 static void
 nfe_int_task(void *arg, int pending)
 {
@@ -1943,7 +1916,6 @@ nfe_int_task(void *arg, int pending)
 	nfe_enable_intr(sc);
 }
 
-
 static __inline void
 nfe_discard_rxbuf(struct nfe_softc *sc, int idx)
 {
@@ -1969,7 +1941,6 @@ nfe_discard_rxbuf(struct nfe_softc *sc, int idx)
 	}
 }
 
-
 static __inline void
 nfe_discard_jrxbuf(struct nfe_softc *sc, int idx)
 {
@@ -1995,7 +1966,6 @@ nfe_discard_jrxbuf(struct nfe_softc *sc, int idx)
 	}
 }
 
-
 static int
 nfe_newbuf(struct nfe_softc *sc, int idx)
 {
@@ -2051,7 +2021,6 @@ nfe_newbuf(struct nfe_softc *sc, int idx)
 	return (0);
 }
 
-
 static int
 nfe_jnewbuf(struct nfe_softc *sc, int idx)
 {
@@ -2106,7 +2075,6 @@ nfe_jnewbuf(struct nfe_softc *sc, int idx)
 	return (0);
 }
 
-
 static int
 nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 {
@@ -2221,7 +2189,6 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npk
 	return (count > 0 ? 0 : EAGAIN);
 }
 
-
 static int
 nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 {
@@ -2337,7 +2304,6 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_np
 	return (count > 0 ? 0 : EAGAIN);
 }
 
-
 static void
 nfe_txeof(struct nfe_softc *sc)
 {
@@ -2626,7 +2592,6 @@ done:
 	NFE_WRITE(sc, NFE_RXFILTER, filter);
 }
 
-
 static void
 nfe_start(if_t ifp)
 {
@@ -2681,7 +2646,6 @@ nfe_start_locked(if_t ifp)
 	}
 }
 
-
 static void
 nfe_watchdog(if_t ifp)
 {
@@ -2718,7 +2682,6 @@ nfe_watchdog(if_t ifp)
 	nfe_init_locked(sc);
 }
 
-
 static void
 nfe_init(void *xsc)
 {
@@ -2729,7 +2692,6 @@ nfe_init(void *xsc)
 	NFE_UNLOCK(sc);
 }
 
-
 static void
 nfe_init_locked(void *xsc)
 {
@@ -2880,7 +2842,6 @@ nfe_init_locked(void *xsc)
 	callout_reset(&sc->nfe_stat_ch, hz, nfe_tick, sc);
 }
 
-
 static void
 nfe_stop(if_t ifp)
 {
@@ -2955,7 +2916,6 @@ nfe_stop(if_t ifp)
 	nfe_stats_update(sc);
 }
 
-
 static int
 nfe_ifmedia_upd(if_t ifp)
 {
@@ -2970,7 +2930,6 @@ nfe_ifmedia_upd(if_t ifp)
 	return (0);
 }
 
-
 static void
 nfe_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr)
 {
@@ -2988,7 +2947,6 @@ nfe_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr)
 	NFE_UNLOCK(sc);
 }
 
-
 void
 nfe_tick(void *xsc)
 {
@@ -3009,7 +2967,6 @@ nfe_tick(void *xsc)
 	callout_reset(&sc->nfe_stat_ch, hz, nfe_tick, sc);
 }
 
-
 static int
 nfe_shutdown(device_t dev)
 {
@@ -3017,7 +2974,6 @@ nfe_shutdown(device_t dev)
 	return (nfe_suspend(dev));
 }
 
-
 static void
 nfe_get_macaddr(struct nfe_softc *sc, uint8_t *addr)
 {
@@ -3046,7 +3002,6 @@ nfe_get_macaddr(struct nfe_softc *sc, uint8_t *addr)
 	}
 }
 
-
 static void
 nfe_set_macaddr(struct nfe_softc *sc, uint8_t *addr)
 {
@@ -3056,7 +3011,6 @@ nfe_set_macaddr(struct nfe_softc *sc, uint8_t *addr)
 	    addr[1] << 8 | addr[0]);
 }
 
-
 /*
  * Map a single buffer address.
  */
@@ -3075,7 +3029,6 @@ nfe_dma_map_segs(void *arg, bus_dma_segment_t *segs, i
 	ctx->nfe_busaddr = segs[0].ds_addr;
 }
 
-
 static int
 sysctl_int_range(SYSCTL_HANDLER_ARGS, int low, int high)
 {
@@ -3094,7 +3047,6 @@ sysctl_int_range(SYSCTL_HANDLER_ARGS, int low, int hig
 	return (0);
 }
 
-
 static int
 sysctl_hw_nfe_proc_limit(SYSCTL_HANDLER_ARGS)
 {
@@ -3103,7 +3055,6 @@ sysctl_hw_nfe_proc_limit(SYSCTL_HANDLER_ARGS)
 	    NFE_PROC_MAX));
 }
 
-
 #define	NFE_SYSCTL_STAT_ADD32(c, h, n, p, d)	\
 	    SYSCTL_ADD_UINT(c, h, OID_AUTO, n, CTLFLAG_RD, p, 0, d)
 #define	NFE_SYSCTL_STAT_ADD64(c, h, n, p, d)	\
@@ -3299,7 +3250,6 @@ nfe_stats_update(struct nfe_softc *sc)
 	}
 }
 
-
 static void
 nfe_set_linkspeed(struct nfe_softc *sc)
 {
@@ -3368,7 +3318,6 @@ nfe_set_linkspeed(struct nfe_softc *sc)
 	mii->mii_media_active = IFM_ETHER | IFM_100_TX | IFM_FDX;
 	nfe_mac_config(sc, mii);
 }
-
 
 static void
 nfe_set_wol(struct nfe_softc *sc)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012204.081M4bDk055261>