Fix identations around LINUX_VERSION_CODE

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 54 insertions, 54 deletions

diff --git a/linux/drivers/media/video/usbvision/usbvision-core.c b/linux/drivers/media/video/usbvision/usbvision-core.c
index bdb822e30..37e3ee142 100644
--- a/linux/drivers/media/video/usbvision/usbvision-core.c
+++ b/linux/drivers/media/video/usbvision/usbvision-core.c
@@ -1,6 +1,6 @@
 /*
  * usbvision-core.c - driver for NT100x USB video capture devices
- * 
+ *
  *
  * Copyright (c) 1999-2005 Joerg Heckenbach <joerg@heckenbach-aw.de>
  *                         Dwaine Garden <dwainegarden@rogers.com>
@@ -49,12 +49,12 @@
 #include <media/audiochip.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	#include <linux/proc_fs.h>
-	#include <linux/tqueue.h>
-	#include <linux/wrapper.h>
+#include <linux/proc_fs.h>
+#include <linux/tqueue.h>
+#include <linux/wrapper.h>
 #else
-	#include <linux/moduleparam.h>
-	#include <linux/workqueue.h>
+#include <linux/moduleparam.h>
+#include <linux/workqueue.h>
 #endif
 
 #ifdef CONFIG_KMOD
@@ -2507,11 +2507,11 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
 		int j, k;
 		struct urb *urb;
 
-		#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-			urb = usb_alloc_urb(USBVISION_URB_FRAMES);
-		#else
-			urb = usb_alloc_urb(USBVISION_URB_FRAMES, GFP_KERNEL);
-		#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+		urb = usb_alloc_urb(USBVISION_URB_FRAMES);
+#else
+		urb = usb_alloc_urb(USBVISION_URB_FRAMES, GFP_KERNEL);
+#endif
 		if (urb == NULL) {
 			err("%s: usb_alloc_urb() failed", __FUNCTION__);
 			return -ENOMEM;
@@ -2520,12 +2520,12 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
 		urb->dev = dev;
 		urb->context = usbvision;
 		urb->pipe = usb_rcvisocpipe(dev, usbvision->video_endp);
-	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 		urb->transfer_flags = USB_ISO_ASAP;
-	#else
+#else
 		urb->transfer_flags = URB_ISO_ASAP;
 		urb->interval = 1;
-	#endif
+#endif
 		urb->transfer_buffer = usbvision->sbuf[bufIdx].data;
 		urb->complete = usbvision_isocIrq;
 		urb->number_of_packets = USBVISION_URB_FRAMES;
diff --git a/linux/drivers/media/video/usbvision/usbvision-i2c.c b/linux/drivers/media/video/usbvision/usbvision-i2c.c
index 0ee2f155e..81bf4df65 100644
--- a/linux/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/linux/drivers/media/video/usbvision/usbvision-i2c.c
@@ -29,8 +29,8 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-	#include <linux/utsname.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
+#include <linux/utsname.h>
 #endif
 #include <linux/init.h>
 #include <asm/uaccess.h>
@@ -212,10 +212,8 @@ static void dec_use(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------	*/
 
 static struct i2c_algorithm i2c_usb_algo = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,30)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,30))
 	.owner         = THIS_MODULE,
-	#endif
 #endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
 	.name          = "USB algorithm",
@@ -375,13 +373,13 @@ static int detach_inform(struct i2c_client *client)
 {
 	struct usb_usbvision *usbvision;
 
-	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-		usbvision = (struct usb_usbvision *)client->adapter->data;
-	#else
-		usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter);
-	#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+	usbvision = (struct usb_usbvision *)client->adapter->data;
+#else
+	usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter);
+#endif
 
-		PDEBUG(DBG_I2C,"usbvision[%d] detaches %s", usbvision->nr, client->name);
+	PDEBUG(DBG_I2C,"usbvision[%d] detaches %s", usbvision->nr, client->name);
 	return 0;
 }
 
@@ -578,11 +576,13 @@ static struct i2c_adapter i2c_adap_template = {
 	.algo_data         = NULL,
 	.client_register   = attach_inform,
 	.client_unregister = detach_inform,
-#if defined (I2C_ADAP_CLASS_TV_ANALOG)
+#ifdef I2C_ADAP_CLASS_TV_ANALOG
 	.class             = I2C_ADAP_CLASS_TV_ANALOG,
-#elif defined (I2C_CLASS_TV_ANALOG)
+#else
+#ifdef I2C_CLASS_TV_ANALOG
 	.class		   = I2C_CLASS_TV_ANALOG,
 #endif
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 	.data              = NULL,
 #endif
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c
index 77eb2a819..90a804be7 100644
--- a/linux/drivers/media/video/usbvision/usbvision-video.c
+++ b/linux/drivers/media/video/usbvision/usbvision-video.c
@@ -1,5 +1,5 @@
 /*
- * USB USBVISION Video device driver 0.9.9 
+ * USB USBVISION Video device driver 0.9.9
  *
  *
  *
@@ -70,12 +70,12 @@
 #include <media/audiochip.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	#include <linux/proc_fs.h>
-	#include <linux/tqueue.h>
-	#include <linux/wrapper.h>
+#include <linux/proc_fs.h>
+#include <linux/tqueue.h>
+#include <linux/wrapper.h>
 #else
-	#include <linux/moduleparam.h>
-	#include <linux/workqueue.h>
+#include <linux/moduleparam.h>
+#include <linux/workqueue.h>
 #endif
 
 #ifdef CONFIG_KMOD
@@ -197,8 +197,8 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE(DRIVER_LICENSE);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-	MODULE_VERSION(USBVISION_VERSION_STRING);
-	MODULE_ALIAS(DRIVER_ALIAS);
+MODULE_VERSION(USBVISION_VERSION_STRING);
+MODULE_ALIAS(DRIVER_ALIAS);
 #endif
 
 
@@ -1541,9 +1541,9 @@ static struct video_device usbvision_video_template = {
 };
 #else
 static struct file_operations usbvision_fops = {
-  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
 	.owner             = THIS_MODULE,
-  #endif
+#endif
 	.open		= usbvision_v4l2_open,
 	.release	= usbvision_v4l2_close,
 	.read		= usbvision_v4l2_read,
@@ -1552,16 +1552,16 @@ static struct file_operations usbvision_fops = {
 	.llseek		= no_llseek,
 };
 static struct video_device usbvision_video_template = {
-  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
 	.owner             = THIS_MODULE,
-  #endif
+#endif
 	.type		= VID_TYPE_TUNER | VID_TYPE_CAPTURE,
 	.hardware	= VID_HARDWARE_USBVISION,
 	.fops		= &usbvision_fops,
-  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	.name           = "usbvision-video",
 	.release	= video_device_release,
-  #endif
+#endif
 	.minor		= -1,
 };
 #endif
@@ -1582,9 +1582,9 @@ static struct video_device usbvision_radio_template=
 };
 #else
 static struct file_operations usbvision_radio_fops = {
-  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
 	.owner             = THIS_MODULE,
-  #endif
+#endif
 	.open		= usbvision_radio_open,
 	.release	= usbvision_radio_close,
 	.ioctl		= usbvision_radio_ioctl,
@@ -1593,16 +1593,16 @@ static struct file_operations usbvision_radio_fops = {
 
 static struct video_device usbvision_radio_template=
 {
-  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
 	.owner             = THIS_MODULE,
-  #endif
+#endif
 	.type		= VID_TYPE_TUNER,
 	.hardware	= VID_HARDWARE_USBVISION,
 	.fops		= &usbvision_radio_fops,
-  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	.release	= video_device_release,
 	.name           = "usbvision-radio",
-  #endif
+#endif
 	.minor		= -1,
 };
 #endif
@@ -1621,9 +1621,9 @@ static struct video_device usbvision_vbi_template=
 };
 #else
 static struct file_operations usbvision_vbi_fops = {
-  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
 	.owner             = THIS_MODULE,
-  #endif
+#endif
 	.open		= usbvision_vbi_open,
 	.release	= usbvision_vbi_close,
 	.ioctl		= usbvision_vbi_ioctl,
@@ -1632,16 +1632,16 @@ static struct file_operations usbvision_vbi_fops = {
 
 static struct video_device usbvision_vbi_template=
 {
-  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,31)
 	.owner             = THIS_MODULE,
-  #endif
+#endif
 	.type		= VID_TYPE_TUNER,
 	.hardware	= VID_HARDWARE_USBVISION,
 	.fops		= &usbvision_vbi_fops,
-  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	.release	= video_device_release,
 	.name           = "usbvision-vbi",
-  #endif
+#endif
 	.minor		= -1,
 };
 #endif
@@ -2100,7 +2100,7 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_driver usbvision_driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,31) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,31)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))
 	.owner		= THIS_MODULE,
 #endif
 	.name		= "usbvision",