1 files changed, 46 insertions, 46 deletions

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 18b471cd1447..b5d6b9ac162a 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -177,12 +177,12 @@ static void irda_usb_build_header(struct irda_usb_cb *self,
                     (!force) && (self->speed != -1)) {
                         /* No speed and xbofs change here
                          * (we'll do it later in the write callback) */
-                        IRDA_DEBUG(2, "%s(), not changing speed yet\n", __FUNCTION__);
+                        IRDA_DEBUG(2, "%s(), not changing speed yet\n", __func__);
                         *header = 0;
                         return;
                 }
 
-                IRDA_DEBUG(2, "%s(), changing speed to %d\n", __FUNCTION__, self->new_speed);
+                IRDA_DEBUG(2, "%s(), changing speed to %d\n", __func__, self->new_speed);
                 self->speed = self->new_speed;
                 /* We will do ` self->new_speed = -1; ' in the completion
                  * handler just in case the current URB fail - Jean II */
@@ -228,7 +228,7 @@ static void irda_usb_build_header(struct irda_usb_cb *self,
         
         /* Set the negotiated additional XBOFS */
         if (self->new_xbofs != -1) {
-                IRDA_DEBUG(2, "%s(), changing xbofs to %d\n", __FUNCTION__, self->new_xbofs);
+                IRDA_DEBUG(2, "%s(), changing xbofs to %d\n", __func__, self->new_xbofs);
                 self->xbofs = self->new_xbofs;
                 /* We will do ` self->new_xbofs = -1; ' in the completion
                  * handler just in case the current URB fail - Jean II */
@@ -302,13 +302,13 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)
         struct urb *urb;
         int ret;
 
-        IRDA_DEBUG(2, "%s(), speed=%d, xbofs=%d\n", __FUNCTION__,
+        IRDA_DEBUG(2, "%s(), speed=%d, xbofs=%d\n", __func__,
                    self->new_speed, self->new_xbofs);
 
         /* Grab the speed URB */
         urb = self->speed_urb;
         if (urb->status != 0) {
-                IRDA_WARNING("%s(), URB still in use!\n", __FUNCTION__);
+                IRDA_WARNING("%s(), URB still in use!\n", __func__);
                 return;
         }
 
@@ -334,7 +334,7 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)
 
         /* Irq disabled -> GFP_ATOMIC */
         if ((ret = usb_submit_urb(urb, GFP_ATOMIC))) {
-                IRDA_WARNING("%s(), failed Speed URB\n", __FUNCTION__);
+                IRDA_WARNING("%s(), failed Speed URB\n", __func__);
         }
 }
 
@@ -347,7 +347,7 @@ static void speed_bulk_callback(struct urb *urb)
 {
         struct irda_usb_cb *self = urb->context;
         
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(2, "%s()\n", __func__);
 
         /* We should always have a context */
         IRDA_ASSERT(self != NULL, return;);
@@ -357,7 +357,7 @@ static void speed_bulk_callback(struct urb *urb)
         /* Check for timeout and other USB nasties */
         if (urb->status != 0) {
                 /* I get a lot of -ECONNABORTED = -103 here - Jean II */
-                IRDA_DEBUG(0, "%s(), URB complete status %d, transfer_flags 0x%04X\n", __FUNCTION__, urb->status, urb->transfer_flags);
+                IRDA_DEBUG(0, "%s(), URB complete status %d, transfer_flags 0x%04X\n", __func__, urb->status, urb->transfer_flags);
 
                 /* Don't do anything here, that might confuse the USB layer.
                  * Instead, we will wait for irda_usb_net_timeout(), the
@@ -392,7 +392,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
         int res, mtt;
         int     err = 1;        /* Failed */
 
-        IRDA_DEBUG(4, "%s() on %s\n", __FUNCTION__, netdev->name);
+        IRDA_DEBUG(4, "%s() on %s\n", __func__, netdev->name);
 
         netif_stop_queue(netdev);
 
@@ -403,7 +403,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
          * We need to check self->present under the spinlock because
          * of irda_usb_disconnect() is synchronous - Jean II */
         if (!self->present) {
-                IRDA_DEBUG(0, "%s(), Device is gone...\n", __FUNCTION__);
+                IRDA_DEBUG(0, "%s(), Device is gone...\n", __func__);
                 goto drop;
         }
 
@@ -437,7 +437,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
         }
 
         if (urb->status != 0) {
-                IRDA_WARNING("%s(), URB still in use!\n", __FUNCTION__);
+                IRDA_WARNING("%s(), URB still in use!\n", __func__);
                 goto drop;
         }
 
@@ -524,7 +524,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
         
         /* Ask USB to send the packet - Irq disabled -> GFP_ATOMIC */
         if ((res = usb_submit_urb(urb, GFP_ATOMIC))) {
-                IRDA_WARNING("%s(), failed Tx URB\n", __FUNCTION__);
+                IRDA_WARNING("%s(), failed Tx URB\n", __func__);
                 self->stats.tx_errors++;
                 /* Let USB recover : We will catch that in the watchdog */
                 /*netif_start_queue(netdev);*/
@@ -556,7 +556,7 @@ static void write_bulk_callback(struct urb *urb)
         struct sk_buff *skb = urb->context;
         struct irda_usb_cb *self = ((struct irda_skb_cb *) skb->cb)->context;
         
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(2, "%s()\n", __func__);
 
         /* We should always have a context */
         IRDA_ASSERT(self != NULL, return;);
@@ -570,7 +570,7 @@ static void write_bulk_callback(struct urb *urb)
         /* Check for timeout and other USB nasties */
         if (urb->status != 0) {
                 /* I get a lot of -ECONNABORTED = -103 here - Jean II */
-                IRDA_DEBUG(0, "%s(), URB complete status %d, transfer_flags 0x%04X\n", __FUNCTION__, urb->status, urb->transfer_flags);
+                IRDA_DEBUG(0, "%s(), URB complete status %d, transfer_flags 0x%04X\n", __func__, urb->status, urb->transfer_flags);
 
                 /* Don't do anything here, that might confuse the USB layer,
                  * and we could go in recursion and blow the kernel stack...
@@ -589,7 +589,7 @@ static void write_bulk_callback(struct urb *urb)
 
         /* If the network is closed, stop everything */
         if ((!self->netopen) || (!self->present)) {
-                IRDA_DEBUG(0, "%s(), Network is gone...\n", __FUNCTION__);
+                IRDA_DEBUG(0, "%s(), Network is gone...\n", __func__);
                 spin_unlock_irqrestore(&self->lock, flags);
                 return;
         }
@@ -600,7 +600,7 @@ static void write_bulk_callback(struct urb *urb)
                     (self->new_xbofs != self->xbofs)) {
                         /* We haven't changed speed yet (because of
                          * IUC_SPEED_BUG), so do it now - Jean II */
-                        IRDA_DEBUG(1, "%s(), Changing speed now...\n", __FUNCTION__);
+                        IRDA_DEBUG(1, "%s(), Changing speed now...\n", __func__);
                         irda_usb_change_speed_xbofs(self);
                 } else {
                         /* New speed and xbof is now commited in hardware */
@@ -632,7 +632,7 @@ static void irda_usb_net_timeout(struct net_device *netdev)
         struct urb *urb;
         int     done = 0;       /* If we have made any progress */
 
-        IRDA_DEBUG(0, "%s(), Network layer thinks we timed out!\n", __FUNCTION__);
+        IRDA_DEBUG(0, "%s(), Network layer thinks we timed out!\n", __func__);
         IRDA_ASSERT(self != NULL, return;);
 
         /* Protect us from USB callbacks, net Tx and else. */
@@ -640,7 +640,7 @@ static void irda_usb_net_timeout(struct net_device *netdev)
 
         /* self->present *MUST* be read under spinlock */
         if (!self->present) {
-                IRDA_WARNING("%s(), device not present!\n", __FUNCTION__);
+                IRDA_WARNING("%s(), device not present!\n", __func__);
                 netif_stop_queue(netdev);
                 spin_unlock_irqrestore(&self->lock, flags);
                 return;
@@ -763,7 +763,7 @@ static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, struc
         struct irda_skb_cb *cb;
         int ret;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(2, "%s()\n", __func__);
 
         /* This should never happen */
         IRDA_ASSERT(skb != NULL, return;);
@@ -786,7 +786,7 @@ static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, struc
                 /* If this ever happen, we are in deep s***.
                  * Basically, the Rx path will stop... */
                 IRDA_WARNING("%s(), Failed to submit Rx URB %d\n",
-                             __FUNCTION__, ret);
+                             __func__, ret);
         }
 }
 
@@ -807,7 +807,7 @@ static void irda_usb_receive(struct urb *urb)
         struct urb *next_urb;
         unsigned int len, docopy;
 
-        IRDA_DEBUG(2, "%s(), len=%d\n", __FUNCTION__, urb->actual_length);
+        IRDA_DEBUG(2, "%s(), len=%d\n", __func__, urb->actual_length);
         
         /* Find ourselves */
         cb = (struct irda_skb_cb *) skb->cb;
@@ -817,7 +817,7 @@ static void irda_usb_receive(struct urb *urb)
 
         /* If the network is closed or the device gone, stop everything */
         if ((!self->netopen) || (!self->present)) {
-                IRDA_DEBUG(0, "%s(), Network is gone!\n", __FUNCTION__);
+                IRDA_DEBUG(0, "%s(), Network is gone!\n", __func__);
                 /* Don't re-submit the URB : will stall the Rx path */
                 return;
         }
@@ -840,7 +840,7 @@ static void irda_usb_receive(struct urb *urb)
                         /* Usually precursor to a hot-unplug on OHCI. */
                 default:
                         self->stats.rx_errors++;
-                        IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X \n", __FUNCTION__, urb->status, urb->transfer_flags);
+                        IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X \n", __func__, urb->status, urb->transfer_flags);
                         break;
                 }
                 /* If we received an error, we don't want to resubmit the
@@ -861,7 +861,7 @@ static void irda_usb_receive(struct urb *urb)
         
         /* Check for empty frames */
         if (urb->actual_length <= self->header_length) {
-                IRDA_WARNING("%s(), empty frame!\n", __FUNCTION__);
+                IRDA_WARNING("%s(), empty frame!\n", __func__);
                 goto done;
         }
 
@@ -967,7 +967,7 @@ static void irda_usb_rx_defer_expired(unsigned long data)
         struct irda_skb_cb *cb;
         struct urb *next_urb;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(2, "%s()\n", __func__);
 
         /* Find ourselves */
         cb = (struct irda_skb_cb *) skb->cb;
@@ -1053,7 +1053,7 @@ static int stir421x_fw_upload(struct irda_usb_cb *self,
                                    patch_block, block_size,
                                    &actual_len, msecs_to_jiffies(500));
                 IRDA_DEBUG(3,"%s(): Bulk send %u bytes, ret=%d\n",
-                           __FUNCTION__, actual_len, ret);
+                           __func__, actual_len, ret);
 
                 if (ret < 0)
                         break;
@@ -1092,7 +1092,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self)
 
         /* We get a patch from userspace */
         IRDA_MESSAGE("%s(): Received firmware %s (%zu bytes)\n",
-                     __FUNCTION__, stir421x_fw_name, fw->size);
+                     __func__, stir421x_fw_name, fw->size);
 
         ret = -EINVAL;
 
@@ -1116,7 +1116,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self)
                                 + (build % 10);
 
                         IRDA_DEBUG(3, "%s(): Firmware Product version %ld\n",
-                                   __FUNCTION__, fw_version);
+                                   __func__, fw_version);
                 }
         }
 
@@ -1172,7 +1172,7 @@ static int irda_usb_net_open(struct net_device *netdev)
         char    hwname[16];
         int i;
         
-        IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(1, "%s()\n", __func__);
 
         IRDA_ASSERT(netdev != NULL, return -1;);
         self = (struct irda_usb_cb *) netdev->priv;
@@ -1182,13 +1182,13 @@ static int irda_usb_net_open(struct net_device *netdev)
         /* Can only open the device if it's there */
         if(!self->present) {
                 spin_unlock_irqrestore(&self->lock, flags);
-                IRDA_WARNING("%s(), device not present!\n", __FUNCTION__);
+                IRDA_WARNING("%s(), device not present!\n", __func__);
                 return -1;
         }
 
         if(self->needspatch) {
                 spin_unlock_irqrestore(&self->lock, flags);
-                IRDA_WARNING("%s(), device needs patch\n", __FUNCTION__) ;
+                IRDA_WARNING("%s(), device needs patch\n", __func__) ;
                 return -EIO ;
         }
 
@@ -1231,7 +1231,7 @@ static int irda_usb_net_open(struct net_device *netdev)
                         /* If this ever happen, we are in deep s***.
                          * Basically, we can't start the Rx path... */
                         IRDA_WARNING("%s(), Failed to allocate Rx skb\n",
-                                     __FUNCTION__);
+                                     __func__);
                         return -1;
                 }
                 //skb_reserve(newskb, USB_IRDA_HEADER - 1);
@@ -1254,7 +1254,7 @@ static int irda_usb_net_close(struct net_device *netdev)
         struct irda_usb_cb *self;
         int     i;
 
-        IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(1, "%s()\n", __func__);
 
         IRDA_ASSERT(netdev != NULL, return -1;);
         self = (struct irda_usb_cb *) netdev->priv;
@@ -1309,7 +1309,7 @@ static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         self = dev->priv;
         IRDA_ASSERT(self != NULL, return -1;);
 
-        IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);
+        IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);
 
         switch (cmd) {
         case SIOCSBANDWIDTH: /* Set bandwidth */
@@ -1367,7 +1367,7 @@ static inline void irda_usb_init_qos(struct irda_usb_cb *self)
 {
         struct irda_class_desc *desc;
 
-        IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(3, "%s()\n", __func__);
         
         desc = self->irda_desc;
         
@@ -1384,7 +1384,7 @@ static inline void irda_usb_init_qos(struct irda_usb_cb *self)
         self->qos.data_size.bits       = desc->bmDataSize;
 
         IRDA_DEBUG(0, "%s(), dongle says speed=0x%X, size=0x%X, window=0x%X, bofs=0x%X, turn=0x%X\n", 
-                __FUNCTION__, self->qos.baud_rate.bits, self->qos.data_size.bits, self->qos.window_size.bits, self->qos.additional_bofs.bits, self->qos.min_turn_time.bits);
+                __func__, self->qos.baud_rate.bits, self->qos.data_size.bits, self->qos.window_size.bits, self->qos.additional_bofs.bits, self->qos.min_turn_time.bits);
 
         /* Don't always trust what the dongle tell us */
         if(self->capability & IUC_SIR_ONLY)
@@ -1419,7 +1419,7 @@ static inline int irda_usb_open(struct irda_usb_cb *self)
 {
         struct net_device *netdev = self->netdev;
 
-        IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(1, "%s()\n", __func__);
 
         irda_usb_init_qos(self);
 
@@ -1442,7 +1442,7 @@ static inline int irda_usb_open(struct irda_usb_cb *self)
  */
 static inline void irda_usb_close(struct irda_usb_cb *self)
 {
-        IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(1, "%s()\n", __func__);
 
         /* Remove netdevice */
         unregister_netdev(self->netdev);
@@ -1515,13 +1515,13 @@ static inline int irda_usb_parse_endpoints(struct irda_usb_cb *self, struct usb_
                                 /* This is our interrupt endpoint */
                                 self->bulk_int_ep = ep;
                         } else {
-                                IRDA_ERROR("%s(), Unrecognised endpoint %02X.\n", __FUNCTION__, ep);
+                                IRDA_ERROR("%s(), Unrecognised endpoint %02X.\n", __func__, ep);
                         }
                 }
         }
 
         IRDA_DEBUG(0, "%s(), And our endpoints are : in=%02X, out=%02X (%d), int=%02X\n",
-                __FUNCTION__, self->bulk_in_ep, self->bulk_out_ep, self->bulk_out_mtu, self->bulk_int_ep);
+                __func__, self->bulk_in_ep, self->bulk_out_ep, self->bulk_out_mtu, self->bulk_int_ep);
 
         return((self->bulk_in_ep != 0) && (self->bulk_out_ep != 0));
 }
@@ -1583,7 +1583,7 @@ static inline struct irda_class_desc *irda_usb_find_class_desc(struct usb_interf
                 0, intf->altsetting->desc.bInterfaceNumber, desc,
                 sizeof(*desc), 500);
         
-        IRDA_DEBUG(1, "%s(), ret=%d\n", __FUNCTION__, ret);
+        IRDA_DEBUG(1, "%s(), ret=%d\n", __func__, ret);
         if (ret < sizeof(*desc)) {
                 IRDA_WARNING("usb-irda: class_descriptor read %s (%d)\n",
                              (ret<0) ? "failed" : "too short", ret);
@@ -1696,10 +1696,10 @@ static int irda_usb_probe(struct usb_interface *intf,
                         /* Martin Diehl says if we get a -EPIPE we should
                          * be fine and we don't need to do a usb_clear_halt().
                          * - Jean II */
-                        IRDA_DEBUG(0, "%s(), Received -EPIPE, ignoring...\n", __FUNCTION__);
+                        IRDA_DEBUG(0, "%s(), Received -EPIPE, ignoring...\n", __func__);
                         break;
                 default:
-                        IRDA_DEBUG(0, "%s(), Unknown error %d\n", __FUNCTION__, ret);
+                        IRDA_DEBUG(0, "%s(), Unknown error %d\n", __func__, ret);
                         ret = -EIO;
                         goto err_out_3;
         }
@@ -1708,7 +1708,7 @@ static int irda_usb_probe(struct usb_interface *intf,
         interface = intf->cur_altsetting;
         if(!irda_usb_parse_endpoints(self, interface->endpoint,
                                      interface->desc.bNumEndpoints)) {
-                IRDA_ERROR("%s(), Bogus endpoints...\n", __FUNCTION__);
+                IRDA_ERROR("%s(), Bogus endpoints...\n", __func__);
                 ret = -EIO;
                 goto err_out_3;
         }
@@ -1815,7 +1815,7 @@ static void irda_usb_disconnect(struct usb_interface *intf)
         struct irda_usb_cb *self = usb_get_intfdata(intf);
         int i;
 
-        IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(1, "%s()\n", __func__);
 
         usb_set_intfdata(intf, NULL);
         if (!self)
@@ -1865,7 +1865,7 @@ static void irda_usb_disconnect(struct usb_interface *intf)
 
         /* Free self and network device */
         free_netdev(self->netdev);
-        IRDA_DEBUG(0, "%s(), USB IrDA Disconnected\n", __FUNCTION__);
+        IRDA_DEBUG(0, "%s(), USB IrDA Disconnected\n", __func__);
 }
 
 /*------------------------------------------------------------------*/