V4L/DVB (6079): Cleanup: remove linux/moduleparam.h from drivers/media files

[safe/jmp/linux-2.6] / drivers / media / video / pvrusb2 / pvrusb2-main.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index d3c538c..1ea0939 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -20,13 +20,10 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/videodev2.h>
 
@@ -46,14 +43,6 @@
                            PVR2_TRACE_INFO| \
                            PVR2_TRACE_TOLERANCE| \
                            PVR2_TRACE_TRAP| \
-                           PVR2_TRACE_FIRMWARE| \
-                           PVR2_TRACE_EEPROM | \
-                           PVR2_TRACE_INIT | \
-                           PVR2_TRACE_I2C | \
-                           PVR2_TRACE_CHIPS | \
-                           PVR2_TRACE_START_STOP | \
-                           PVR2_TRACE_CTL | \
-                           PVR2_TRACE_DEBUGIFC | \
                            0)
 
 int pvrusb2_debug = DEFAULT_DEBUG_MASK;
@@ -62,7 +51,7 @@ module_param_named(debug,pvrusb2_debug,int,S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug trace mask");
 
 #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS
-static struct pvr2_sysfs_class *class_ptr = 0;
+static struct pvr2_sysfs_class *class_ptr = NULL;
 #endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */
 
 static void pvr_setup_attach(struct pvr2_context *pvr)
@@ -112,10 +101,10 @@ static void pvr_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_driver pvr_driver = {
-       name:           "pvrusb2",
-       id_table:       pvr2_device_table,
-       probe:          pvr_probe,
-       disconnect:     pvr_disconnect
+       .name =         "pvrusb2",
+       .id_table =     pvr2_device_table,
+       .probe =        pvr_probe,
+       .disconnect =   pvr_disconnect
 };
 
 /*