From 8ffce1e79d48b3a493bed8d3171c54afddf3caf4 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:46:42 +0000 Subject: [PATCH] wi: clean up empty lines in .c and .h files --- sys/dev/wi/if_wavelan_ieee.h | 8 -------- sys/dev/wi/if_wi.c | 2 +- sys/dev/wi/if_wi_macio.c | 1 - sys/dev/wi/if_wi_pccard.c | 1 - sys/dev/wi/if_wi_pci.c | 3 +-- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h index dd8a9883eda3..27b7ed0f80bb 100644 --- a/sys/dev/wi/if_wavelan_ieee.h +++ b/sys/dev/wi/if_wavelan_ieee.h @@ -478,7 +478,6 @@ struct wi_rx_frame { #define WI_MGMT_HDRLEN 0x3C #define WI_CTL_HDRLEN 0x3C - /* * all data packets have a snap (sub-network access protocol) header that * isn't entirely definied, but added for ethernet compatibility. @@ -488,7 +487,6 @@ struct wi_snap_frame { u_int16_t wi_type; }; - /* * management frame headers * note: all management frames consist of a static header and variable length @@ -592,7 +590,6 @@ struct wi_mgmt_deauth_hdr { u_int16_t wi_reason; }; - /* * rid configuration register definitions */ @@ -602,7 +599,6 @@ struct wi_mgmt_deauth_hdr { #define WI_RID_PROCFRAME 0x3137 /* Return full frame information */ #define WI_RID_PRISM2 0x3138 /* tell if we're a prism2 card or not */ - /* * 802.11 definitions */ @@ -650,7 +646,6 @@ struct wi_mgmt_deauth_hdr { #define WI_FCS_LEN 0x4 /* checksum length */ - /* * management definitions */ @@ -693,7 +688,6 @@ struct wi_mgmt_deauth_hdr { #define WI_VAR_SRATES_MASK 0x7F - /* * control definitions */ @@ -704,7 +698,6 @@ struct wi_mgmt_deauth_hdr { #define WI_STYPE_CTL_CFEND 0x00E0 #define WI_STYPE_CTL_CFENDCFACK 0x00F0 - /* * ap scanning structures */ @@ -729,7 +722,6 @@ struct wi_scan_p2_hdr { }; #define WI_PRISM2_RES_SIZE 62 - /* * prism2 debug mode definitions */ diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c index 0731508ddd3a..2ad582de32a9 100644 --- a/sys/dev/wi/if_wi.c +++ b/sys/dev/wi/if_wi.c @@ -162,7 +162,7 @@ static void wi_scan_end(struct ieee80211com *); static void wi_getradiocaps(struct ieee80211com *, int, int *, struct ieee80211_channel[]); static void wi_set_channel(struct ieee80211com *); - + static __inline int wi_write_val(struct wi_softc *sc, int rid, u_int16_t val) { diff --git a/sys/dev/wi/if_wi_macio.c b/sys/dev/wi/if_wi_macio.c index 438dde0fb994..42f86c91c60d 100644 --- a/sys/dev/wi/if_wi_macio.c +++ b/sys/dev/wi/if_wi_macio.c @@ -87,7 +87,6 @@ static device_method_t wi_macio_methods[] = { DEVMETHOD(device_attach, wi_macio_attach), DEVMETHOD(device_detach, wi_detach), DEVMETHOD(device_shutdown, wi_shutdown), - { 0, 0 } }; diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c index 9c84c01c9b96..ef24271f4ab5 100644 --- a/sys/dev/wi/if_wi_pccard.c +++ b/sys/dev/wi/if_wi_pccard.c @@ -85,7 +85,6 @@ static device_method_t wi_pccard_methods[] = { DEVMETHOD(device_attach, wi_pccard_attach), DEVMETHOD(device_detach, wi_detach), DEVMETHOD(device_shutdown, wi_shutdown), - { 0, 0 } }; diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c index c0431617d4be..e537239408a5 100644 --- a/sys/dev/wi/if_wi_pci.c +++ b/sys/dev/wi/if_wi_pci.c @@ -84,7 +84,6 @@ static device_method_t wi_pci_methods[] = { DEVMETHOD(device_shutdown, wi_shutdown), DEVMETHOD(device_suspend, wi_pci_suspend), DEVMETHOD(device_resume, wi_pci_resume), - { 0, 0 } }; @@ -246,7 +245,7 @@ wi_pci_suspend(device_t dev) WI_LOCK(sc); wi_stop(sc, 1); WI_UNLOCK(sc); - + return (0); }