]> err.no Git - linux-2.6/blobdiff - drivers/usb/misc/appledisplay.c
pci: VT3336 can't do MSI either
[linux-2.6] / drivers / usb / misc / appledisplay.c
index 1cb56f2d5c8421df8036cf09bc00d9405fb97c32..a076c24a312a53faa30af12e362128ac70fee2eb 100644 (file)
@@ -29,7 +29,6 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 
 #define APPLE_VENDOR_ID                0x05AC
 
@@ -104,11 +103,11 @@ static void appledisplay_complete(struct urb *urb)
        case -ESHUTDOWN:
                /* This urb is terminated, clean up */
                dbg("%s - urb shuttingdown with status: %d",
-                       __FUNCTION__, status);
+                       __func__, status);
                return;
        default:
                dbg("%s - nonzero urb status received: %d",
-                       __FUNCTION__, status);
+                       __func__, status);
                goto exit;
        }
 
@@ -132,7 +131,7 @@ exit:
        retval = usb_submit_urb(pdata->urb, GFP_ATOMIC);
        if (retval) {
                err("%s - usb_submit_urb failed with result %d",
-                       __FUNCTION__, retval);
+                       __func__, retval);
        }
 }