Re: dev/ic bzero casts
Date: Mon, 20 Jun 2011 19:30:52 -0400 (EDT)
From: Ted Unangst ted.unan...@gmail.com
there's no need to cast to char *.
Some of those now will fit on a single line.
Index: dc.c
===
RCS file: /home/tedu/cvs/src/sys/dev/ic/dc.c,v
retrieving revision 1.122
diff -u -r1.122 dc.c
--- dc.c 5 Mar 2011 13:39:26 - 1.122
+++ dc.c 20 Jun 2011 23:22:22 -
@@ -749,7 +749,7 @@
struct dc_mii_frame frame;
int i, phy_reg;
- bzero((char *)frame, sizeof(frame));
+ bzero(frame, sizeof(frame));
if (DC_IS_ADMTEK(sc) phy != DC_ADMTEK_PHYADDR)
return;
@@ -903,7 +903,7 @@
sc-dc_cdata.dc_tx_cnt++;
sframe = sc-dc_ldata-dc_tx_list[i];
sp = sc-dc_ldata-dc_sbuf[0];
- bzero((char *)sp, DC_SFRAME_LEN);
+ bzero(sp, DC_SFRAME_LEN);
sframe-dc_data = htole32(sc-sc_listmap-dm_segs[0].ds_addr +
offsetof(struct dc_list_data, dc_sbuf));
@@ -1126,7 +1126,7 @@
sc-dc_cdata.dc_tx_cnt++;
sframe = sc-dc_ldata-dc_tx_list[i];
sp = sc-dc_ldata-dc_sbuf[0];
- bzero((char *)sp, DC_SFRAME_LEN);
+ bzero(sp, DC_SFRAME_LEN);
sframe-dc_data = htole32(sc-sc_listmap-dm_segs[0].ds_addr +
offsetof(struct dc_list_data, dc_sbuf));
@@ -1934,7 +1934,7 @@
* 82c169 chips.
*/
if (sc-dc_flags DC_PNIC_RX_BUG_WAR)
- bzero((char *)mtod(m_new, char *), m_new-m_len);
+ bzero(mtod(m_new, char *), m_new-m_len);
bus_dmamap_sync(sc-sc_dmat, sc-dc_cdata.dc_rx_chain[i].sd_map, 0,
sc-dc_cdata.dc_rx_chain[i].sd_map-dm_mapsize,
@@ -3112,7 +3112,7 @@
sc-dc_cdata.dc_rx_chain[i].sd_mbuf = NULL;
}
}
- bzero((char *)sc-dc_ldata-dc_rx_list,
+ bzero(sc-dc_ldata-dc_rx_list,
sizeof(sc-dc_ldata-dc_rx_list));
/*
@@ -3136,7 +3136,7 @@
sc-dc_cdata.dc_tx_chain[i].sd_mbuf = NULL;
}
}
- bzero((char *)sc-dc_ldata-dc_tx_list,
+ bzero(sc-dc_ldata-dc_tx_list,
sizeof(sc-dc_ldata-dc_tx_list));
bus_dmamap_sync(sc-sc_dmat, sc-sc_listmap,
Index: if_wi.c
===
RCS file: /home/tedu/cvs/src/sys/dev/ic/if_wi.c,v
retrieving revision 1.149
diff -u -r1.149 if_wi.c
--- if_wi.c 30 Aug 2010 20:42:27 - 1.149
+++ if_wi.c 20 Jun 2011 23:25:38 -
@@ -226,7 +226,7 @@
printf(: unable to read station address\n);
return (error);
}
- bcopy((char *)mac.wi_mac_addr, (char *)ic-ic_myaddr,
+ bcopy(mac.wi_mac_addr, ic-ic_myaddr,
IEEE80211_ADDR_LEN);
wi_get_id(sc);
@@ -332,7 +332,7 @@
sc-wi_flags |= WI_FLAGS_HAS_WEP;
timeout_set(sc-sc_timo, funcs-f_inquire, sc);
- bzero((char *)sc-wi_stats, sizeof(sc-wi_stats));
+ bzero(sc-wi_stats, sizeof(sc-wi_stats));
/* Find supported rates. */
rates.wi_type = WI_RID_DATA_RATES;
@@ -730,12 +730,12 @@
m-m_pkthdr.len = m-m_len =
letoh16(rx_frame.wi_dat_len) + WI_SNAPHDR_LEN;
- bcopy((char *)rx_frame.wi_dst_addr,
- (char *)eh-ether_dhost, ETHER_ADDR_LEN);
- bcopy((char *)rx_frame.wi_src_addr,
- (char *)eh-ether_shost, ETHER_ADDR_LEN);
- bcopy((char *)rx_frame.wi_type,
- (char *)eh-ether_type, ETHER_TYPE_LEN);
+ bcopy(rx_frame.wi_dst_addr,
+ eh-ether_dhost, ETHER_ADDR_LEN);
+ bcopy(rx_frame.wi_src_addr,
+ eh-ether_shost, ETHER_ADDR_LEN);
+ bcopy(rx_frame.wi_type,
+ eh-ether_type, ETHER_TYPE_LEN);
if (wi_read_data(sc, id, WI_802_11_OFFSET,
mtod(m, caddr_t) + sizeof(struct ether_header),
@@ -1402,7 +1402,7 @@
ifp = sc-sc_ic.ic_if;
- bzero((char *)mcast, sizeof(mcast));
+ bzero(mcast, sizeof(mcast));
mcast.wi_type = WI_RID_MCAST_LIST;
mcast.wi_len = ((ETHER_ADDR_LEN / 2) * 16) + 1;
@@ -1416,7 +1416,7 @@
ETHER_FIRST_MULTI(step, sc-sc_ic.ic_ac, enm);
while (enm != NULL) {
if (i = 16) {
- bzero((char *)mcast, sizeof(mcast));
+ bzero(mcast, sizeof(mcast));
break;
}
@@ -1424,7 +1424,7 @@
ifp-if_flags |= IFF_ALLMULTI;
goto allmulti;
}
- bcopy(enm-enm_addrlo, (char *)mcast.wi_mcast[i],
+ bcopy(enm-enm_addrlo, mcast.wi_mcast[i],
ETHER_ADDR_LEN);
i++;
dev/ic bzero casts
there's no need to cast to char *.
Index: dc.c
===
RCS file: /home/tedu/cvs/src/sys/dev/ic/dc.c,v
retrieving revision 1.122
diff -u -r1.122 dc.c
--- dc.c5 Mar 2011 13:39:26 - 1.122
+++ dc.c20 Jun 2011 23:22:22 -
@@ -749,7 +749,7 @@
struct dc_mii_frame frame;
int i, phy_reg;
- bzero((char *)frame, sizeof(frame));
+ bzero(frame, sizeof(frame));
if (DC_IS_ADMTEK(sc) phy != DC_ADMTEK_PHYADDR)
return;
@@ -903,7 +903,7 @@
sc-dc_cdata.dc_tx_cnt++;
sframe = sc-dc_ldata-dc_tx_list[i];
sp = sc-dc_ldata-dc_sbuf[0];
- bzero((char *)sp, DC_SFRAME_LEN);
+ bzero(sp, DC_SFRAME_LEN);
sframe-dc_data = htole32(sc-sc_listmap-dm_segs[0].ds_addr +
offsetof(struct dc_list_data, dc_sbuf));
@@ -1126,7 +1126,7 @@
sc-dc_cdata.dc_tx_cnt++;
sframe = sc-dc_ldata-dc_tx_list[i];
sp = sc-dc_ldata-dc_sbuf[0];
- bzero((char *)sp, DC_SFRAME_LEN);
+ bzero(sp, DC_SFRAME_LEN);
sframe-dc_data = htole32(sc-sc_listmap-dm_segs[0].ds_addr +
offsetof(struct dc_list_data, dc_sbuf));
@@ -1934,7 +1934,7 @@
* 82c169 chips.
*/
if (sc-dc_flags DC_PNIC_RX_BUG_WAR)
- bzero((char *)mtod(m_new, char *), m_new-m_len);
+ bzero(mtod(m_new, char *), m_new-m_len);
bus_dmamap_sync(sc-sc_dmat, sc-dc_cdata.dc_rx_chain[i].sd_map, 0,
sc-dc_cdata.dc_rx_chain[i].sd_map-dm_mapsize,
@@ -3112,7 +3112,7 @@
sc-dc_cdata.dc_rx_chain[i].sd_mbuf = NULL;
}
}
- bzero((char *)sc-dc_ldata-dc_rx_list,
+ bzero(sc-dc_ldata-dc_rx_list,
sizeof(sc-dc_ldata-dc_rx_list));
/*
@@ -3136,7 +3136,7 @@
sc-dc_cdata.dc_tx_chain[i].sd_mbuf = NULL;
}
}
- bzero((char *)sc-dc_ldata-dc_tx_list,
+ bzero(sc-dc_ldata-dc_tx_list,
sizeof(sc-dc_ldata-dc_tx_list));
bus_dmamap_sync(sc-sc_dmat, sc-sc_listmap,
Index: if_wi.c
===
RCS file: /home/tedu/cvs/src/sys/dev/ic/if_wi.c,v
retrieving revision 1.149
diff -u -r1.149 if_wi.c
--- if_wi.c 30 Aug 2010 20:42:27 - 1.149
+++ if_wi.c 20 Jun 2011 23:25:38 -
@@ -226,7 +226,7 @@
printf(: unable to read station address\n);
return (error);
}
- bcopy((char *)mac.wi_mac_addr, (char *)ic-ic_myaddr,
+ bcopy(mac.wi_mac_addr, ic-ic_myaddr,
IEEE80211_ADDR_LEN);
wi_get_id(sc);
@@ -332,7 +332,7 @@
sc-wi_flags |= WI_FLAGS_HAS_WEP;
timeout_set(sc-sc_timo, funcs-f_inquire, sc);
- bzero((char *)sc-wi_stats, sizeof(sc-wi_stats));
+ bzero(sc-wi_stats, sizeof(sc-wi_stats));
/* Find supported rates. */
rates.wi_type = WI_RID_DATA_RATES;
@@ -730,12 +730,12 @@
m-m_pkthdr.len = m-m_len =
letoh16(rx_frame.wi_dat_len) + WI_SNAPHDR_LEN;
- bcopy((char *)rx_frame.wi_dst_addr,
- (char *)eh-ether_dhost, ETHER_ADDR_LEN);
- bcopy((char *)rx_frame.wi_src_addr,
- (char *)eh-ether_shost, ETHER_ADDR_LEN);
- bcopy((char *)rx_frame.wi_type,
- (char *)eh-ether_type, ETHER_TYPE_LEN);
+ bcopy(rx_frame.wi_dst_addr,
+ eh-ether_dhost, ETHER_ADDR_LEN);
+ bcopy(rx_frame.wi_src_addr,
+ eh-ether_shost, ETHER_ADDR_LEN);
+ bcopy(rx_frame.wi_type,
+ eh-ether_type, ETHER_TYPE_LEN);
if (wi_read_data(sc, id, WI_802_11_OFFSET,
mtod(m, caddr_t) + sizeof(struct ether_header),
@@ -1402,7 +1402,7 @@
ifp = sc-sc_ic.ic_if;
- bzero((char *)mcast, sizeof(mcast));
+ bzero(mcast, sizeof(mcast));
mcast.wi_type = WI_RID_MCAST_LIST;
mcast.wi_len = ((ETHER_ADDR_LEN / 2) * 16) + 1;
@@ -1416,7 +1416,7 @@
ETHER_FIRST_MULTI(step, sc-sc_ic.ic_ac, enm);
while (enm != NULL) {
if (i = 16) {
- bzero((char *)mcast, sizeof(mcast));
+ bzero(mcast, sizeof(mcast));
break;
}
@@ -1424,7 +1424,7 @@
ifp-if_flags |= IFF_ALLMULTI;
goto allmulti;
}
- bcopy(enm-enm_addrlo, (char *)mcast.wi_mcast[i],
+ bcopy(enm-enm_addrlo, mcast.wi_mcast[i],
ETHER_ADDR_LEN);
i++;
ETHER_NEXT_MULTI(step, enm);
@@ -1446,9 +1446,9 @@
switch(wreq-wi_type) {
