1 files changed, 4 insertions, 20 deletions

diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index 8f7b1f281f0a..ca9bf5f9b3e5 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -85,19 +85,17 @@ static int prism2sta_probe_usb(
 	hfa384x_t	*hw = NULL;
 	int              result = 0;
 
-	DBFENTER;
-
 	dev = interface_to_usbdev(interface);
 
 	if ((wlandev = create_wlan()) == NULL) {
-		WLAN_LOG_ERROR("%s: Memory allocation failure.\n", dev_info);
+		printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info);
 		result = -EIO;
 		goto failed;
 	}
 	hw = wlandev->priv;
 
 	if ( wlan_setup(wlandev) != 0 ) {
-		WLAN_LOG_ERROR("%s: wlan_setup() failed.\n", dev_info);
+		printk(KERN_ERR "%s: wlan_setup() failed.\n", dev_info);
 		result = -EIO;
 		goto failed;
 	}
@@ -120,7 +118,7 @@ static int prism2sta_probe_usb(
 			unregister_wlandev(wlandev);
 			hfa384x_destroy(hw);
 			result = -EIO;
-			WLAN_LOG_ERROR(
+			printk(KERN_ERR
 				"%s: hfa384x_corereset() failed.\n",
 				dev_info);
 			goto failed;
@@ -132,7 +130,7 @@ static int prism2sta_probe_usb(
 	wlandev->msdstate = WLAN_MSD_HWPRESENT;
 
         if ( register_wlandev(wlandev) != 0 ) {
-		WLAN_LOG_ERROR("%s: register_wlandev() failed.\n", dev_info);
+		printk(KERN_ERR "%s: register_wlandev() failed.\n", dev_info);
 		result = -EIO;
 		goto failed;
         }
@@ -148,8 +146,6 @@ static int prism2sta_probe_usb(
 	wlandev = NULL;
 
  done:
-	DBFEXIT;
-
 	usb_set_intfdata(interface, wlandev);
 	return result;
 }
@@ -179,8 +175,6 @@ prism2sta_disconnect_usb(struct usb_interface *interface)
 {
 	wlandevice_t		*wlandev;
 
-        DBFENTER;
-
 	wlandev = (wlandevice_t *) usb_get_intfdata(interface);
 
 	if ( wlandev != NULL ) {
@@ -265,9 +259,7 @@ prism2sta_disconnect_usb(struct usb_interface *interface)
 	}
 
  exit:
-
 	usb_set_intfdata(interface, NULL);
-	DBFEXIT;
 }
 
 
@@ -281,21 +273,13 @@ static struct usb_driver prism2_usb_driver = {
 
 static int __init prism2usb_init(void)
 {
-        DBFENTER;
-
 	/* This call will result in calls to prism2sta_probe_usb. */
 	return usb_register(&prism2_usb_driver);
-
-	DBFEXIT;
 };
 
 static void __exit prism2usb_cleanup(void)
 {
-        DBFENTER;
-
 	usb_deregister(&prism2_usb_driver);
-
-	DBFEXIT;
 };
 
 module_init(prism2usb_init);