Merge branch 'fix/hda' into for-linus

[pandora-kernel.git] / drivers / isdn / hisax / hfc_usb.c

diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 98b0149..9de5420 100644 (file)
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -37,7 +37,6 @@
 #include <linux/kernel_stat.h>
 #include <linux/usb.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
 #include <linux/sched.h>
 #include <linux/moduleparam.h>
 #include "hisax.h"
@@ -905,7 +904,7 @@ rx_int_complete(struct urb *urb)
        if (status) {
                printk(KERN_INFO
                       "HFC-S USB: %s error resubmitting URB fifo(%d)\n",
-                      __FUNCTION__, fifon);
+                      __func__, fifon);
        }
 }
 
@@ -1543,14 +1542,14 @@ hfc_usb_disconnect(struct usb_interface *intf)
                                stop_isoc_chain(&context->fifos[i]);
                                DBG(HFCUSB_DBG_INIT,
                                    "HFC-S USB: %s stopping ISOC chain Fifo(%i)",
-                                   __FUNCTION__, i);
+                                   __func__, i);
                        }
                } else {
                        if (context->fifos[i].active > 0) {
                                context->fifos[i].active = 0;
                                DBG(HFCUSB_DBG_INIT,
                                    "HFC-S USB: %s unlinking URB for Fifo(%i)",
-                                   __FUNCTION__, i);
+                                   __func__, i);
                        }
                        usb_kill_urb(context->fifos[i].urb);
                        usb_free_urb(context->fifos[i].urb);