aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/bwn
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:43:48 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:43:48 +0000
commit7163a84975bdda6a2897d0b371a737d6673f277c (patch)
tree137f79abb22171c3d33df80db2fa184db5b2f270 /sys/dev/bwn
parent93b628b9d85a4eff7340a652a98794bcacae3d2b (diff)
Notes
Diffstat (limited to 'sys/dev/bwn')
-rw-r--r--sys/dev/bwn/if_bwn.c14
-rw-r--r--sys/dev/bwn/if_bwn_pci.c2
-rw-r--r--sys/dev/bwn/if_bwn_pcivar.h1
-rw-r--r--sys/dev/bwn/if_bwn_phy_g.c1
-rw-r--r--sys/dev/bwn/if_bwnvar.h1
5 files changed, 4 insertions, 15 deletions
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index 37d743e15febb..9b1d1d21d5fa2 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -580,7 +580,7 @@ bwn_attach(device_t dev)
device_printf(sc->sc_dev, "couldn't allocate registers\n");
return (error);
}
-
+
if ((error = bhnd_alloc_pmu(sc->sc_dev))) {
bus_release_resource(sc->sc_dev, SYS_RES_MEMORY,
sc->sc_mem_rid, sc->sc_mem_res);
@@ -685,7 +685,7 @@ fail:
free(mac, M_DEVBUF);
bhnd_release_pmu(dev);
bwn_release_bus_providers(sc);
-
+
if (sc->sc_mem_res != NULL) {
bus_release_resource(sc->sc_dev, SYS_RES_MEMORY,
sc->sc_mem_rid, sc->sc_mem_res);
@@ -1307,7 +1307,6 @@ bwn_attach_core(struct bwn_mac *mac)
have_bg = 1;
have_a = 1;
}
-
#if 0
device_printf(sc->sc_dev, "%s: iost=0x%04hx, have_a=%d, have_bg=%d,"
@@ -3041,7 +3040,7 @@ bwn_dma_32_setdesc(struct bwn_dma_ring *dr,
struct bhnd_dma_translation *dt;
uint32_t addr, addrext, ctl;
int slot;
-
+
descbase = dr->dr_ring_descbase;
dma = &dr->dr_mac->mac_method.dma;
dt = &dma->translation;
@@ -3137,8 +3136,7 @@ bwn_dma_64_setdesc(struct bwn_dma_ring *dr,
uint32_t addrext;
uint32_t ctl0, ctl1;
int slot;
-
-
+
descbase = dr->dr_ring_descbase;
dma = &dr->dr_mac->mac_method.dma;
dt = &dma->translation;
@@ -3686,7 +3684,6 @@ bwn_gpio_control(struct bwn_mac *mac, uint32_t pins)
return (0);
}
-
static int
bwn_gpio_init(struct bwn_mac *mac)
{
@@ -4527,7 +4524,6 @@ bwn_fwinitvals_write(struct bwn_mac *mac, const struct bwn_fwinitvals *ivals,
BWN_WRITE_4(mac, offset, be32toh(iv->data.d32));
iv = GET_NEXTIV32(iv);
} else {
-
if (array_size < sizeof(iv->data.d16))
goto fail;
array_size -= sizeof(iv->data.d16);
@@ -6008,7 +6004,6 @@ bwn_rxeof(struct bwn_mac *mac, struct mbuf *m, const void *_rxhdr)
break;
}
-
phytype = chanstat & BWN_RX_CHAN_PHYTYPE;
if (macstat & BWN_RX_MAC_FCSERR)
@@ -7172,7 +7167,6 @@ bwn_dma_attach(struct bwn_mac *mac)
return (ENXIO);
}
-
/* Fetch our device->host DMA translation and tag */
error = bhnd_get_dma_translation(sc->sc_dev, addr_width, 0, &dmat,
&dma_translation);
diff --git a/sys/dev/bwn/if_bwn_pci.c b/sys/dev/bwn/if_bwn_pci.c
index 610f8bdeb823b..51ff56184f8a3 100644
--- a/sys/dev/bwn/if_bwn_pci.c
+++ b/sys/dev/bwn/if_bwn_pci.c
@@ -90,7 +90,6 @@ static const struct bwn_pci_device siba_devices[] = {
BWN_QUIRK_UNTESTED),
BWN_BCM_DEV(BCM4328_D11G, "BCM4328/4312 802.11g", 0),
-
{ 0, 0, NULL, 0 }
};
@@ -102,7 +101,6 @@ static const struct bwn_pci_device bcma_devices[] = {
BWN_BCM_DEV(BCM43224_D11N, "BCM43224 802.11n Dual-Band", 0),
BWN_BCM_DEV(BCM43224_D11N_ID_VEN1, "BCM43224 802.11n Dual-Band",0),
BWN_BCM_DEV(BCM43225_D11N2G, "BCM43225 802.11n 2GHz", 0),
-
{ 0, 0, NULL, 0}
};
diff --git a/sys/dev/bwn/if_bwn_pcivar.h b/sys/dev/bwn/if_bwn_pcivar.h
index 06c781e557f63..2b134de07e26b 100644
--- a/sys/dev/bwn/if_bwn_pcivar.h
+++ b/sys/dev/bwn/if_bwn_pcivar.h
@@ -91,7 +91,6 @@ struct bwn_pci_device {
uint32_t quirks;
};
-
#define BWN_BCM_DEV(_devid, _desc, _quirks) \
{ PCI_VENDOR_BROADCOM, PCI_DEVID_ ## _devid, \
"Broadcom " _desc " Wireless", _quirks }
diff --git a/sys/dev/bwn/if_bwn_phy_g.c b/sys/dev/bwn/if_bwn_phy_g.c
index fecb06109282a..1659eb2a99bb2 100644
--- a/sys/dev/bwn/if_bwn_phy_g.c
+++ b/sys/dev/bwn/if_bwn_phy_g.c
@@ -1689,7 +1689,6 @@ bwn_wa_grev1(struct bwn_mac *mac)
bwn_ofdmtab_write_2(mac, BWN_OFDMTAB_AGC2, i,
bwn_tab_noise_g2[i]);
-
for (i = 0; i < N(bwn_tab_rotor); i++)
bwn_ofdmtab_write_4(mac, BWN_OFDMTAB_ROTOR, i,
bwn_tab_rotor[i]);
diff --git a/sys/dev/bwn/if_bwnvar.h b/sys/dev/bwn/if_bwnvar.h
index a97268de93d6e..42930c20377aa 100644
--- a/sys/dev/bwn/if_bwnvar.h
+++ b/sys/dev/bwn/if_bwnvar.h
@@ -161,7 +161,6 @@ struct bwn_mac;
#define BWN_DMA_WRITE(dr, offset, value) \
(BWN_WRITE_4(dr->dr_mac, dr->dr_base + offset, value))
-
typedef enum {
BWN_PHY_BAND_2G = 0,
BWN_PHY_BAND_5G_LO = 1,