[Midnightbsd-cvs] src [7240] trunk/sys/dev: finish changes needed on dev code for clang
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Aug 12 17:48:34 EDT 2015
Revision: 7240
http://svnweb.midnightbsd.org/src/?rev=7240
Author: laffer1
Date: 2015-08-12 17:48:33 -0400 (Wed, 12 Aug 2015)
Log Message:
-----------
finish changes needed on dev code for clang
Modified Paths:
--------------
trunk/sys/dev/bwn/if_bwn.c
trunk/sys/dev/bwn/if_bwnvar.h
trunk/sys/dev/stge/if_stge.c
trunk/sys/dev/ti/if_ti.c
trunk/sys/dev/tl/if_tl.c
trunk/sys/dev/vr/if_vr.c
trunk/sys/dev/wb/if_wb.c
trunk/sys/dev/xl/if_xl.c
Modified: trunk/sys/dev/bwn/if_bwn.c
===================================================================
--- trunk/sys/dev/bwn/if_bwn.c 2015-08-12 02:00:24 UTC (rev 7239)
+++ trunk/sys/dev/bwn/if_bwn.c 2015-08-12 21:48:33 UTC (rev 7240)
@@ -73,7 +73,8 @@
#include <dev/bwn/if_bwnreg.h>
#include <dev/bwn/if_bwnvar.h>
-SYSCTL_NODE(_hw, OID_AUTO, bwn, CTLFLAG_RD, 0, "Broadcom driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, bwn, CTLFLAG_RD, 0,
+ "Broadcom driver parameters");
/*
* Tunable & sysctl variables.
@@ -1427,7 +1428,7 @@
/*
* XXX please removes m_defrag(9)
*/
- m_new = m_defrag(m, M_DONTWAIT);
+ m_new = m_defrag(m, M_NOWAIT);
if (m_new == NULL) {
device_printf(sc->sc_dev,
"%s: can't defrag TX buffer\n",
@@ -1543,7 +1544,7 @@
if (error) { /* error == EFBIG */
struct mbuf *m_new;
- m_new = m_defrag(m, M_DONTWAIT);
+ m_new = m_defrag(m, M_NOWAIT);
if (m_new == NULL) {
if_printf(ifp, "%s: can't defrag TX buffer\n",
__func__);
@@ -9123,7 +9124,7 @@
padding = (macstat & BWN_RX_MAC_PADDING) ? 2 : 0;
totlen = len + padding;
KASSERT(totlen <= MCLBYTES, ("too big..\n"));
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
device_printf(sc->sc_dev, "%s: out of memory", __func__);
goto error;
@@ -9178,11 +9179,11 @@
struct bwn_dma *dma = &mac->mac_method.dma;
struct bwn_rxhdr4 *hdr;
bus_dmamap_t map;
- bus_addr_t paddr;
+ bus_addr_t paddr = 0;
struct mbuf *m;
int error;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
error = ENOBUFS;
Modified: trunk/sys/dev/bwn/if_bwnvar.h
===================================================================
--- trunk/sys/dev/bwn/if_bwnvar.h 2015-08-12 02:00:24 UTC (rev 7239)
+++ trunk/sys/dev/bwn/if_bwnvar.h 2015-08-12 21:48:33 UTC (rev 7240)
@@ -714,7 +714,7 @@
uint16_t tx_status;
struct bwn_plcp6 rts_plcp;
uint8_t rts_frame[16];
- uint8_t pad1[2];;
+ uint8_t pad1[2];
struct bwn_plcp6 plcp;
} __packed old;
/* format > r410 */
Modified: trunk/sys/dev/stge/if_stge.c
===================================================================
--- trunk/sys/dev/stge/if_stge.c 2015-08-12 02:00:24 UTC (rev 7239)
+++ trunk/sys/dev/stge/if_stge.c 2015-08-12 21:48:33 UTC (rev 7240)
@@ -91,7 +91,7 @@
uint16_t stge_vendorid;
uint16_t stge_deviceid;
const char *stge_name;
-} const stge_products[] = {
+} stge_products[] = {
{ VENDOR_SUNDANCETI, DEVICEID_SUNDANCETI_ST1023,
"Sundance ST-1023 Gigabit Ethernet" },
@@ -453,11 +453,11 @@
pci_enable_busmaster(dev);
cmd = pci_read_config(dev, PCIR_COMMAND, 2);
val = pci_read_config(dev, PCIR_BAR(1), 4);
- if ((val & 0x01) != 0)
+ if (PCI_BAR_IO(val))
sc->sc_spec = stge_res_spec_mem;
else {
val = pci_read_config(dev, PCIR_BAR(0), 4);
- if ((val & 0x01) == 0) {
+ if (!PCI_BAR_IO(val)) {
device_printf(sc->sc_dev, "couldn't locate IO BAR\n");
error = ENXIO;
goto fail;
@@ -1082,7 +1082,7 @@
error = bus_dmamap_load_mbuf_sg(sc->sc_cdata.stge_tx_tag,
txd->tx_dmamap, *m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, STGE_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, STGE_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -1610,7 +1610,7 @@
m->m_data += ETHER_HDR_LEN;
n = m;
} else {
- MGETHDR(n, M_DONTWAIT, MT_DATA);
+ MGETHDR(n, M_NOWAIT, MT_DATA);
if (n != NULL) {
bcopy(m->m_data, n->m_data, ETHER_HDR_LEN);
m->m_data += ETHER_HDR_LEN;
@@ -2440,7 +2440,7 @@
bus_dmamap_t map;
int nsegs;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MCLBYTES;
Modified: trunk/sys/dev/ti/if_ti.c
===================================================================
--- trunk/sys/dev/ti/if_ti.c 2015-08-12 02:00:24 UTC (rev 7239)
+++ trunk/sys/dev/ti/if_ti.c 2015-08-12 21:48:33 UTC (rev 7240)
@@ -145,7 +145,7 @@
* Various supported device vendors/types and their names.
*/
-static const struct ti_type const ti_devs[] = {
+static const struct ti_type ti_devs[] = {
{ ALT_VENDORID, ALT_DEVICEID_ACENIC,
"Alteon AceNIC 1000baseSX Gigabit Ethernet" },
{ ALT_VENDORID, ALT_DEVICEID_ACENIC_COPPER,
Modified: trunk/sys/dev/tl/if_tl.c
===================================================================
--- trunk/sys/dev/tl/if_tl.c 2015-08-12 02:00:24 UTC (rev 7239)
+++ trunk/sys/dev/tl/if_tl.c 2015-08-12 21:48:33 UTC (rev 7240)
@@ -229,7 +229,7 @@
* Various supported device vendors/types and their names.
*/
-static const struct tl_type const tl_devs[] = {
+static const struct tl_type tl_devs[] = {
{ TI_VENDORID, TI_DEVICEID_THUNDERLAN,
"Texas Instruments ThunderLAN" },
{ COMPAQ_VENDORID, COMPAQ_DEVICEID_NETEL_10,
@@ -1366,7 +1366,7 @@
{
struct mbuf *m_new = NULL;
- m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m_new == NULL)
return(ENOBUFS);
@@ -1807,13 +1807,13 @@
if (m != NULL) {
struct mbuf *m_new = NULL;
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+ MGETHDR(m_new, M_NOWAIT, MT_DATA);
if (m_new == NULL) {
if_printf(ifp, "no memory for tx list\n");
return(1);
}
if (m_head->m_pkthdr.len > MHLEN) {
- MCLGET(m_new, M_DONTWAIT);
+ MCLGET(m_new, M_NOWAIT);
if (!(m_new->m_flags & M_EXT)) {
m_freem(m_new);
if_printf(ifp, "no memory for tx list\n");
Modified: trunk/sys/dev/vr/if_vr.c
===================================================================
--- trunk/sys/dev/vr/if_vr.c 2015-08-12 02:00:24 UTC (rev 7239)
+++ trunk/sys/dev/vr/if_vr.c 2015-08-12 21:48:33 UTC (rev 7240)
@@ -119,7 +119,7 @@
u_int16_t vr_did;
int vr_quirks;
const char *vr_name;
-} const vr_devs[] = {
+} vr_devs[] = {
{ VIA_VENDORID, VIA_DEVICEID_RHINE,
VR_Q_NEEDALIGN,
"VIA VT3043 Rhine I 10/100BaseTX" },
@@ -199,7 +199,7 @@
int tx_cfg;
int bcr_cfg;
int value;
-} const vr_tx_threshold_tables[] = {
+} vr_tx_threshold_tables[] = {
{ VR_TXTHRESH_64BYTES, VR_BCR1_TXTHRESH64BYTES, 64 },
{ VR_TXTHRESH_128BYTES, VR_BCR1_TXTHRESH128BYTES, 128 },
{ VR_TXTHRESH_256BYTES, VR_BCR1_TXTHRESH256BYTES, 256 },
@@ -1220,7 +1220,7 @@
bus_dmamap_t map;
int nsegs;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MCLBYTES;
@@ -1781,7 +1781,7 @@
* to copy, just do it all the time.
*/
if ((sc->vr_quirks & VR_Q_NEEDALIGN) != 0) {
- m = m_defrag(*m_head, M_DONTWAIT);
+ m = m_defrag(*m_head, M_NOWAIT);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -1800,7 +1800,7 @@
padlen = VR_MIN_FRAMELEN - m->m_pkthdr.len;
if (M_WRITABLE(m) == 0) {
/* Get a writable copy. */
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
m_freem(*m_head);
if (m == NULL) {
*m_head = NULL;
@@ -1809,7 +1809,7 @@
*m_head = m;
}
if (m->m_next != NULL || M_TRAILINGSPACE(m) < padlen) {
- m = m_defrag(m, M_DONTWAIT);
+ m = m_defrag(m, M_NOWAIT);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -1831,7 +1831,7 @@
error = bus_dmamap_load_mbuf_sg(sc->vr_cdata.vr_tx_tag, txd->tx_dmamap,
*m_head, txsegs, &nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, VR_MAXFRAGS);
+ m = m_collapse(*m_head, M_NOWAIT, VR_MAXFRAGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/wb/if_wb.c
===================================================================
--- trunk/sys/dev/wb/if_wb.c 2015-08-12 02:00:24 UTC (rev 7239)
+++ trunk/sys/dev/wb/if_wb.c 2015-08-12 21:48:33 UTC (rev 7240)
@@ -130,7 +130,7 @@
/*
* Various supported device vendors/types and their names.
*/
-static const struct wb_type const wb_devs[] = {
+static const struct wb_type wb_devs[] = {
{ WB_VENDORID, WB_DEVICEID_840F,
"Winbond W89C840F 10/100BaseTX" },
{ CP_VENDORID, CP_DEVICEID_RL100,
@@ -843,7 +843,7 @@
struct mbuf *m_new = NULL;
if (m == NULL) {
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+ MGETHDR(m_new, M_NOWAIT, MT_DATA);
if (m_new == NULL)
return(ENOBUFS);
m_new->m_data = c->wb_buf;
@@ -1193,11 +1193,11 @@
if (m != NULL) {
struct mbuf *m_new = NULL;
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+ MGETHDR(m_new, M_NOWAIT, MT_DATA);
if (m_new == NULL)
return(1);
if (m_head->m_pkthdr.len > MHLEN) {
- MCLGET(m_new, M_DONTWAIT);
+ MCLGET(m_new, M_NOWAIT);
if (!(m_new->m_flags & M_EXT)) {
m_freem(m_new);
return(1);
Modified: trunk/sys/dev/xl/if_xl.c
===================================================================
--- trunk/sys/dev/xl/if_xl.c 2015-08-12 02:00:24 UTC (rev 7239)
+++ trunk/sys/dev/xl/if_xl.c 2015-08-12 21:48:33 UTC (rev 7240)
@@ -161,7 +161,7 @@
/*
* Various supported device vendors/types and their names.
*/
-static const struct xl_type const xl_devs[] = {
+static const struct xl_type xl_devs[] = {
{ TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT,
"3Com 3c900-TPO Etherlink XL" },
{ TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT_COMBO,
@@ -1762,7 +1762,7 @@
XL_LOCK_ASSERT(sc);
- m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m_new == NULL)
return (ENOBUFS);
@@ -2358,7 +2358,7 @@
* and would waste cycles.
*/
if (error) {
- m_new = m_collapse(*m_head, M_DONTWAIT, XL_MAXFRAGS);
+ m_new = m_collapse(*m_head, M_NOWAIT, XL_MAXFRAGS);
if (m_new == NULL) {
m_freem(*m_head);
*m_head = NULL;
More information about the Midnightbsd-cvs
mailing list