style:

 put return values on a line by themselves.
 fix some paste issues where whitespace was used instead of tabs.

1 files changed, 64 insertions, 32 deletions

diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 6322a3b..358507c 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -216,7 +216,8 @@ DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
 #define SF_CLRBIT(sc, reg, x)				\
 	csr_write_4(sc, reg, csr_read_4(sc, reg) & ~x)
 
-static u_int32_t csr_read_4(sc, reg)
+static u_int32_t
+csr_read_4(sc, reg)
 	struct sf_softc		*sc;
 	int			reg;
 {
@@ -232,7 +233,8 @@ static u_int32_t csr_read_4(sc, reg)
 	return(val);
 }
 
-static u_int8_t sf_read_eeprom(sc, reg)
+static u_int8_t
+sf_read_eeprom(sc, reg)
 	struct sf_softc		*sc;
 	int			reg;
 {
@@ -244,7 +246,8 @@ static u_int8_t sf_read_eeprom(sc, reg)
 	return(val);
 }
 
-static void csr_write_4(sc, reg, val)
+static void
+csr_write_4(sc, reg, val)
 	struct sf_softc		*sc;
 	int			reg;
 	u_int32_t		val;
@@ -258,7 +261,8 @@ static void csr_write_4(sc, reg, val)
 	return;
 }
 
-static u_int32_t sf_calchash(addr)
+static u_int32_t
+sf_calchash(addr)
 	caddr_t			addr;
 {
 	u_int32_t		crc, carry;
@@ -288,7 +292,8 @@ static u_int32_t sf_calchash(addr)
  * offset 'idx.' The perfect filter only has 16 entries so do
  * some sanity tests.
  */
-static int sf_setperf(sc, idx, mac)
+static int
+sf_setperf(sc, idx, mac)
 	struct sf_softc		*sc;
 	int			idx;
 	caddr_t			mac;
@@ -318,7 +323,8 @@ static int sf_setperf(sc, idx, mac)
  * specified mac address 'mac.' If 'prio' is nonzero, update the
  * priority hash table instead of the filter hash table.
  */
-static int sf_sethash(sc, mac, prio)
+static int
+sf_sethash(sc, mac, prio)
 	struct sf_softc		*sc;
 	caddr_t			mac;
 	int			prio;
@@ -345,7 +351,8 @@ static int sf_sethash(sc, mac, prio)
 /*
  * Set a VLAN tag in the receive filter.
  */
-static int sf_setvlan(sc, idx, vlan)
+static int
+sf_setvlan(sc, idx, vlan)
 	struct sf_softc		*sc;
 	int			idx;
 	u_int32_t		vlan;
@@ -360,7 +367,8 @@ static int sf_setvlan(sc, idx, vlan)
 }
 #endif
 
-static int sf_miibus_readreg(dev, phy, reg)
+static int
+sf_miibus_readreg(dev, phy, reg)
 	device_t		dev;
 	int			phy, reg;
 {
@@ -385,7 +393,8 @@ static int sf_miibus_readreg(dev, phy, reg)
 	return(val & 0x0000FFFF);
 }
 
-static int sf_miibus_writereg(dev, phy, reg, val)
+static int
+sf_miibus_writereg(dev, phy, reg, val)
 	device_t		dev;
 	int			phy, reg, val;
 {
@@ -406,7 +415,8 @@ static int sf_miibus_writereg(dev, phy, reg, val)
 	return(0);
 }
 
-static void sf_miibus_statchg(dev)
+static void
+sf_miibus_statchg(dev)
 	device_t		dev;
 {
 	struct sf_softc		*sc;
@@ -426,7 +436,8 @@ static void sf_miibus_statchg(dev)
 	return;
 }
 
-static void sf_setmulti(sc)
+static void
+sf_setmulti(sc)
 	struct sf_softc		*sc;
 {
 	struct ifnet		*ifp;
@@ -475,7 +486,8 @@ static void sf_setmulti(sc)
 /*
  * Set media options.
  */
-static int sf_ifmedia_upd(ifp)
+static int
+sf_ifmedia_upd(ifp)
 	struct ifnet		*ifp;
 {
 	struct sf_softc		*sc;
@@ -497,7 +509,8 @@ static int sf_ifmedia_upd(ifp)
 /*
  * Report current media status.
  */
-static void sf_ifmedia_sts(ifp, ifmr)
+static void
+sf_ifmedia_sts(ifp, ifmr)
 	struct ifnet		*ifp;
 	struct ifmediareq	*ifmr;
 {
@@ -514,7 +527,8 @@ static void sf_ifmedia_sts(ifp, ifmr)
 	return;
 }
 
-static int sf_ioctl(ifp, command, data)
+static int
+sf_ioctl(ifp, command, data)
 	struct ifnet		*ifp;
 	u_long			command;
 	caddr_t			data;
@@ -571,7 +585,8 @@ static int sf_ioctl(ifp, command, data)
 	return(error);
 }
 
-static void sf_reset(sc)
+static void
+sf_reset(sc)
 	struct sf_softc		*sc;
 {
 	register int		i;
@@ -603,7 +618,8 @@ static void sf_reset(sc)
  * We also check the subsystem ID so that we can identify exactly which
  * NIC has been found, if possible.
  */
-static int sf_probe(dev)
+static int
+sf_probe(dev)
 	device_t		dev;
 {
 	struct sf_type		*t;
@@ -658,7 +674,8 @@ static int sf_probe(dev)
  * Attach the interface. Allocate softc structures, do ifmedia
  * setup and ethernet/BPF attach.
  */
-static int sf_attach(dev)
+static int
+sf_attach(dev)
 	device_t		dev;
 {
 	int			i;
@@ -827,7 +844,8 @@ fail:
 	return(error);
 }
 
-static int sf_detach(dev)
+static int
+sf_detach(dev)
 	device_t		dev;
 {
 	struct sf_softc		*sc;
@@ -855,7 +873,8 @@ static int sf_detach(dev)
 	return(0);
 }
 
-static int sf_init_rx_ring(sc)
+static int
+sf_init_rx_ring(sc)
 	struct sf_softc		*sc;
 {
 	struct sf_list_data	*ld;
@@ -876,7 +895,8 @@ static int sf_init_rx_ring(sc)
 	return(0);
 }
 
-static void sf_init_tx_ring(sc)
+static void
+sf_init_tx_ring(sc)
 	struct sf_softc		*sc;
 {
 	struct sf_list_data	*ld;
@@ -900,7 +920,8 @@ static void sf_init_tx_ring(sc)
 	return;
 }
 
-static int sf_newbuf(sc, c, m)
+static int
+sf_newbuf(sc, c, m)
 	struct sf_softc		*sc;
 	struct sf_rx_bufdesc_type0	*c;
 	struct mbuf		*m;
@@ -952,7 +973,8 @@ static int sf_newbuf(sc, c, m)
  * packets into properly aligned buffers before handing them off.
  */
 
-static void sf_rxeof(sc)
+static void
+sf_rxeof(sc)
 	struct sf_softc		*sc;
 {
 	struct ether_header	*eh;
@@ -1019,7 +1041,8 @@ static void sf_rxeof(sc)
  * gives the impression that it should match the producer/consumer
  * index, which is the offset in 8 byte blocks.
  */
-static void sf_txeof(sc)
+static void
+sf_txeof(sc)
 	struct sf_softc		*sc;
 {
 	int			txcons, cmpprodidx, cmpconsidx;
@@ -1064,7 +1087,8 @@ static void sf_txeof(sc)
 	return;
 }
 
-static void sf_txthresh_adjust(sc)
+static void
+sf_txthresh_adjust(sc)
 	struct sf_softc		*sc;
 {
 	u_int32_t		txfctl;
@@ -1087,7 +1111,8 @@ static void sf_txthresh_adjust(sc)
 	return;
 }
 
-static void sf_intr(arg)
+static void
+sf_intr(arg)
 	void			*arg;
 {
 	struct sf_softc		*sc;
@@ -1146,7 +1171,8 @@ static void sf_intr(arg)
 	return;
 }
 
-static void sf_init(xsc)
+static void
+sf_init(xsc)
 	void			*xsc;
 {
 	struct sf_softc		*sc;
@@ -1260,7 +1286,8 @@ static void sf_init(xsc)
 	return;
 }
 
-static int sf_encap(sc, c, m_head)
+static int
+sf_encap(sc, c, m_head)
 	struct sf_softc		*sc;
 	struct sf_tx_bufdesc_type0 *c;
 	struct mbuf		*m_head;
@@ -1323,7 +1350,8 @@ static int sf_encap(sc, c, m_head)
 	return(0);
 }
 
-static void sf_start(ifp)
+static void
+sf_start(ifp)
 	struct ifnet		*ifp;
 {
 	struct sf_softc		*sc;
@@ -1405,7 +1433,8 @@ static void sf_start(ifp)
 	return;
 }
 
-static void sf_stop(sc)
+static void
+sf_stop(sc)
 	struct sf_softc		*sc;
 {
 	int			i;
@@ -1457,7 +1486,8 @@ static void sf_stop(sc)
  * indirect data register, the contents of the address register could
  * be changed out from under us.
  */     
-static void sf_stats_update(xsc)
+static void
+sf_stats_update(xsc)
 	void			*xsc;
 {
 	struct sf_softc		*sc;
@@ -1500,7 +1530,8 @@ static void sf_stats_update(xsc)
 	return;
 }
 
-static void sf_watchdog(ifp)
+static void
+sf_watchdog(ifp)
 	struct ifnet		*ifp;
 {
 	struct sf_softc		*sc;
@@ -1524,7 +1555,8 @@ static void sf_watchdog(ifp)
 	return;
 }
 
-static void sf_shutdown(dev)
+static void
+sf_shutdown(dev)
 	device_t		dev;
 {
 	struct sf_softc		*sc;