include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / isdn / hisax / hfc_usb.c

diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 98b0149..ed9527a 100644 (file)
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -37,9 +37,9 @@
 #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 <linux/slab.h>
 #include "hisax.h"
 #include "hisax_if.h"
 #include "hfc_usb.h"
@@ -818,8 +818,8 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
        }
        /* we have a complete hdlc packet */
        if (finish) {
-               if ((!fifo->skbuff->data[fifo->skbuff->len - 1])
-                   && (fifo->skbuff->len > 3)) {
+               if (fifo->skbuff->len > 3 &&
+                               !fifo->skbuff->data[fifo->skbuff->len - 1]) {
 
                        if (fifon == HFCUSB_D_RX) {
                                DBG(HFCUSB_DBG_DCHANNEL,
@@ -905,7 +905,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);
        }
 }
 
@@ -1087,7 +1087,7 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
                        break;
                default:
                        DBG(HFCUSB_DBG_STATES,
-                              "HFC_USB: hfc_usb_d_l2l1: unkown state : %#x", pr);
+                              "HFC_USB: hfc_usb_d_l2l1: unknown state : %#x", pr);
                        break;
        }
 }
@@ -1543,14 +1543,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);