aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/airo.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-07-29 02:01:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-08-22 16:29:56 -0400
commitc94c93da90a9e46a73a5733ff8454fb4b14733fb (patch)
treea2c504b9210cbedb3c0406a2a57f761817513b57 /drivers/net/wireless/airo.c
parentd9c6350431d0c8cac000c6a230d9a20dad52e26d (diff)
wireless: replace __FUNCTION__ with __func__
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r--drivers/net/wireless/airo.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index b5cd850a4a59..ae58a12befd3 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1915,7 +1915,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {
1915 struct airo_info *ai = dev->priv; 1915 struct airo_info *ai = dev->priv;
1916 1916
1917 if (!skb) { 1917 if (!skb) {
1918 airo_print_err(dev->name, "%s: skb == NULL!",__FUNCTION__); 1918 airo_print_err(dev->name, "%s: skb == NULL!",__func__);
1919 return 0; 1919 return 0;
1920 } 1920 }
1921 npacks = skb_queue_len (&ai->txq); 1921 npacks = skb_queue_len (&ai->txq);
@@ -1964,7 +1964,7 @@ static int mpi_send_packet (struct net_device *dev)
1964 if ((skb = skb_dequeue(&ai->txq)) == NULL) { 1964 if ((skb = skb_dequeue(&ai->txq)) == NULL) {
1965 airo_print_err(dev->name, 1965 airo_print_err(dev->name,
1966 "%s: Dequeue'd zero in send_packet()", 1966 "%s: Dequeue'd zero in send_packet()",
1967 __FUNCTION__); 1967 __func__);
1968 return 0; 1968 return 0;
1969 } 1969 }
1970 1970
@@ -2115,7 +2115,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {
2115 u32 *fids = priv->fids; 2115 u32 *fids = priv->fids;
2116 2116
2117 if ( skb == NULL ) { 2117 if ( skb == NULL ) {
2118 airo_print_err(dev->name, "%s: skb == NULL!", __FUNCTION__); 2118 airo_print_err(dev->name, "%s: skb == NULL!", __func__);
2119 return 0; 2119 return 0;
2120 } 2120 }
2121 2121
@@ -2186,7 +2186,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {
2186 } 2186 }
2187 2187
2188 if ( skb == NULL ) { 2188 if ( skb == NULL ) {
2189 airo_print_err(dev->name, "%s: skb == NULL!", __FUNCTION__); 2189 airo_print_err(dev->name, "%s: skb == NULL!", __func__);
2190 return 0; 2190 return 0;
2191 } 2191 }
2192 2192
@@ -4127,7 +4127,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
4127 if (test_bit(FLAG_ENABLED, &ai->flags) && (RID_WEP_TEMP != rid)) 4127 if (test_bit(FLAG_ENABLED, &ai->flags) && (RID_WEP_TEMP != rid))
4128 airo_print_err(ai->dev->name, 4128 airo_print_err(ai->dev->name,
4129 "%s: MAC should be disabled (rid=%04x)", 4129 "%s: MAC should be disabled (rid=%04x)",
4130 __FUNCTION__, rid); 4130 __func__, rid);
4131 memset(&cmd, 0, sizeof(cmd)); 4131 memset(&cmd, 0, sizeof(cmd));
4132 memset(&rsp, 0, sizeof(rsp)); 4132 memset(&rsp, 0, sizeof(rsp));
4133 4133
@@ -4142,7 +4142,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
4142 &ai->config_desc.rid_desc, sizeof(Rid)); 4142 &ai->config_desc.rid_desc, sizeof(Rid));
4143 4143
4144 if (len < 4 || len > 2047) { 4144 if (len < 4 || len > 2047) {
4145 airo_print_err(ai->dev->name, "%s: len=%d", __FUNCTION__, len); 4145 airo_print_err(ai->dev->name, "%s: len=%d", __func__, len);
4146 rc = -1; 4146 rc = -1;
4147 } else { 4147 } else {
4148 memcpy((char *)ai->config_desc.virtual_host_addr, 4148 memcpy((char *)ai->config_desc.virtual_host_addr,
@@ -4151,9 +4151,9 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
4151 rc = issuecommand(ai, &cmd, &rsp); 4151 rc = issuecommand(ai, &cmd, &rsp);
4152 if ((rc & 0xff00) != 0) { 4152 if ((rc & 0xff00) != 0) {
4153 airo_print_err(ai->dev->name, "%s: Write rid Error %d", 4153 airo_print_err(ai->dev->name, "%s: Write rid Error %d",
4154 __FUNCTION__, rc); 4154 __func__, rc);
4155 airo_print_err(ai->dev->name, "%s: Cmd=%04x", 4155 airo_print_err(ai->dev->name, "%s: Cmd=%04x",
4156 __FUNCTION__, cmd.cmd); 4156 __func__, cmd.cmd);
4157 } 4157 }
4158 4158
4159 if ((rsp.status & 0x7f00)) 4159 if ((rsp.status & 0x7f00))