moved pvrusb2 driver into the kernel tree

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>

36 files changed, 85 insertions, 85 deletions

diff --git a/v4l_experimental/pvrusb2/pvrusb2-audio.c b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
index 88aeb1926..7e2fab330 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-audio.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -155,7 +155,7 @@ static int msp3400_check(struct pvr2_msp3400_handler *ctxt)
 	unsigned long msk;
 	unsigned int idx;
 
-	for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]); 
+	for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);
 	     idx++) {
 		msk = 1 << idx;
 		if (ctxt->stale_mask & msk) continue;
@@ -172,7 +172,7 @@ static void msp3400_update(struct pvr2_msp3400_handler *ctxt)
 	unsigned long msk;
 	unsigned int idx;
 
-	for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]); 
+	for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);
 	     idx++) {
 		msk = 1 << idx;
 		if (!(ctxt->stale_mask & msk)) continue;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-audio.h b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.h
index 536339b68..536339b68 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-audio.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-context.c b/linux/drivers/media/video/pvrusb2/pvrusb2-context.c
index 7044ba027..b8f7fb043 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-context.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -183,7 +183,7 @@ void pvr2_channel_done(struct pvr2_channel *cp)
 
 
 int pvr2_channel_claim_stream(struct pvr2_channel *cp,
-                              struct pvr2_context_stream *sp)
+			      struct pvr2_context_stream *sp)
 {
 	int code = 0;
 	pvr2_context_enter(cp->mc_head); do {
diff --git a/v4l_experimental/pvrusb2/pvrusb2-context.h b/linux/drivers/media/video/pvrusb2/pvrusb2-context.h
index e721cc559..e721cc559 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-context.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-context.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-debug.h b/linux/drivers/media/video/pvrusb2/pvrusb2-debug.h
index 078f5f5a0..078f5f5a0 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-debug.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-debug.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-debugifc.c b/linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
index 5ecf98c77..bcfe468eb 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-debugifc.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
@@ -41,7 +41,7 @@ static struct debugifc_mask_item mask_items[] = {
 
 
 static unsigned int debugifc_count_whitespace(const char *buf,
-                                              unsigned int count)
+					      unsigned int count)
 {
 	unsigned int scnt;
 	char ch;
@@ -58,7 +58,7 @@ static unsigned int debugifc_count_whitespace(const char *buf,
 
 
 static unsigned int debugifc_count_nonwhitespace(const char *buf,
-                                                 unsigned int count)
+						 unsigned int count)
 {
 	unsigned int scnt;
 	char ch;
@@ -74,8 +74,8 @@ static unsigned int debugifc_count_nonwhitespace(const char *buf,
 
 
 static unsigned int debugifc_isolate_word(const char *buf,unsigned int count,
-                                          const char **wstrPtr,
-                                          unsigned int *wlenPtr)
+					  const char **wstrPtr,
+					  unsigned int *wlenPtr)
 {
 	const char *wptr;
 	unsigned int consume_cnt = 0;
@@ -102,7 +102,7 @@ static unsigned int debugifc_isolate_word(const char *buf,unsigned int count,
 
 
 static int debugifc_parse_unsigned_number(const char *buf,unsigned int count,
-                                          u32 *num_ptr)
+					  u32 *num_ptr)
 {
 	u32 result = 0;
 	u32 val;
@@ -138,7 +138,7 @@ static int debugifc_parse_unsigned_number(const char *buf,unsigned int count,
 
 
 static int debugifc_match_keyword(const char *buf,unsigned int count,
-                                  const char *keyword)
+				  const char *keyword)
 {
 	unsigned int kl;
 	if (!keyword) return 0;
@@ -163,7 +163,7 @@ static unsigned long debugifc_find_mask(const char *buf,unsigned int count)
 
 
 static int debugifc_print_mask(char *buf,unsigned int sz,
-                               unsigned long msk,unsigned long val)
+			       unsigned long msk,unsigned long val)
 {
 	struct debugifc_mask_item *mip;
 	unsigned int idx;
@@ -184,9 +184,9 @@ static int debugifc_print_mask(char *buf,unsigned int sz,
 }
 
 static unsigned int debugifc_parse_subsys_mask(const char *buf,
-                                               unsigned int count,
-                                               unsigned long *mskPtr,
-                                               unsigned long *valPtr)
+					       unsigned int count,
+					       unsigned long *mskPtr,
+					       unsigned long *valPtr)
 {
 	const char *wptr;
 	unsigned int consume_cnt = 0;
@@ -286,7 +286,7 @@ int pvr2_debugifc_print_info(struct pvr2_hdw *hdw,char *buf,unsigned int acnt)
 
 
 int pvr2_debugifc_print_status(struct pvr2_hdw *hdw,
-                               char *buf,unsigned int acnt)
+			       char *buf,unsigned int acnt)
 {
 	int bcnt = 0;
 	int ccnt;
@@ -338,7 +338,7 @@ int pvr2_debugifc_print_status(struct pvr2_hdw *hdw,
 
 
 int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf,
-                         unsigned int count)
+			 unsigned int count)
 {
 	const char *wptr;
 	unsigned int wlen;
@@ -444,7 +444,7 @@ int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf,
 
 
 int pvr2_debugifc_docmd(struct pvr2_hdw *hdw,const char *buf,
-                        unsigned int count)
+			unsigned int count)
 {
 	unsigned int bcnt = 0;
 	int ret;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-debugifc.h b/linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.h
index 990b02d35..990b02d35 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-debugifc.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-debugifc.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-demod.c b/linux/drivers/media/video/pvrusb2/pvrusb2-demod.c
index dca787dfa..dca787dfa 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-demod.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-demod.c
diff --git a/v4l_experimental/pvrusb2/pvrusb2-demod.h b/linux/drivers/media/video/pvrusb2/pvrusb2-demod.h
index 4c4e40ffb..4c4e40ffb 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-demod.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-demod.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-eeprom.c b/linux/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
index 60ee45ca2..60ee45ca2 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-eeprom.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
diff --git a/v4l_experimental/pvrusb2/pvrusb2-eeprom.h b/linux/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
index 061cecd91..061cecd91 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-eeprom.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index 9fb036356..6d797cb55 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-encoder.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -147,7 +147,7 @@ static int pvr2_read_encoder_words(struct pvr2_hdw *hdw,int statusFl,
 
 
 static int pvr2_write_encoder_vcmd (struct pvr2_hdw *hdw, u8 cmd,
-                                    int args, ...)
+				    int args, ...)
 {
 	unsigned int poll_count;
 	int ret = 0;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-encoder.h b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.h
index 01b5a0b89..01b5a0b89 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-encoder.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-hdw-internal.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 12934d3a4..b18906ea6 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-hdw-internal.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -207,7 +207,7 @@ struct pvr2_hdw {
 };
 
 int pvr2_hdw_set_ctl_value_internal(struct pvr2_hdw *hdw,
-                                    unsigned int ctl_id,int value);
+				    unsigned int ctl_id,int value);
 int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw);
 
 
diff --git a/v4l_experimental/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 01a1b8f80..1ee2fcda4 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -53,7 +53,7 @@ module_param(initusbreset, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(initusbreset, "Do USB reset device on probe");
 module_param(procreload, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(procreload,
-                 "Attempt init failure recovery with firmware reload");
+		 "Attempt init failure recovery with firmware reload");
 module_param_array(tuner,    int, NULL, 0444);
 MODULE_PARM_DESC(tuner,"specify installed tuner type");
 module_param_array(tolerance,    int, NULL, 0444);
@@ -168,7 +168,7 @@ static int pvr2_ctl_get_subsys_mask(struct pvr2_hdw *hdw,int ctl_id);
 static int pvr2_ctl_set_subsys_mask(struct pvr2_hdw *hdw,int ctl_id,int val);
 static int pvr2_ctl_get_subsys_stream_mask(struct pvr2_hdw *hdw,int ctl_id);
 static int pvr2_ctl_set_subsys_stream_mask(struct pvr2_hdw *hdw,int ctl_id,
-                                           int val);
+					   int val);
 
 static struct pvr2_ctl_def control_defs[PVR2_CID_COUNT] =
 {
@@ -893,8 +893,8 @@ unsigned long pvr2_hdw_subsys_stream_get(struct pvr2_hdw *hdw)
 
 
 void pvr2_hdw_subsys_stream_bit_chg_no_lock(struct pvr2_hdw *hdw,
-                                            unsigned long msk,
-                                            unsigned long val)
+					    unsigned long msk,
+					    unsigned long val)
 {
 	unsigned long val2;
 	msk &= PVR2_SUBSYS_ALL;
@@ -907,8 +907,8 @@ void pvr2_hdw_subsys_stream_bit_chg_no_lock(struct pvr2_hdw *hdw,
 
 
 void pvr2_hdw_subsys_stream_bit_chg(struct pvr2_hdw *hdw,
-                                    unsigned long msk,
-                                    unsigned long val)
+				    unsigned long msk,
+				    unsigned long val)
 {
 	LOCK_TAKE(hdw->big_lock); do {
 		pvr2_hdw_subsys_stream_bit_chg_no_lock(hdw,msk,val);
@@ -957,7 +957,7 @@ int pvr2_hdw_set_streaming(struct pvr2_hdw *hdw,int enable_flag)
 
 
 int pvr2_hdw_set_stream_type_no_lock(struct pvr2_hdw *hdw,
-                                     enum pvr2_config config)
+				     enum pvr2_config config)
 {
 	unsigned long sm = hdw->subsys_enabled_mask;
 	if (!hdw->flag_ok) return -EIO;
@@ -1400,7 +1400,7 @@ int pvr2_hdw_get_ctl_max_value(struct pvr2_hdw *hdw,unsigned int ctl_id)
 /* Set current value for given control - normally this is just stored and
    the hardware isn't updated until the commit function is called. */
 int pvr2_hdw_set_ctl_value_internal(struct pvr2_hdw *hdw,
-                                    unsigned int ctl_id,int value)
+				    unsigned int ctl_id,int value)
 {
 	if (ctl_id >= PVR2_CID_COUNT) return -EINVAL;
 	if (value < control_defs[ctl_id].min_value) return -EINVAL;
@@ -1435,8 +1435,8 @@ int pvr2_hdw_set_ctl_value(struct pvr2_hdw *hdw,unsigned int ctl_id,int value)
 /* Retrieve string name for a given control value (returns a null pointer
    for any invalid combinations). */
 const char *pvr2_hdw_get_ctl_value_name(struct pvr2_hdw *hdw,
-                                        unsigned int ctl_id,
-                                        int value)
+					unsigned int ctl_id,
+					int value)
 {
 	struct pvr2_ctl_def *cdef;
 	if (ctl_id >= PVR2_CID_COUNT) return 0;
@@ -1699,7 +1699,7 @@ static int pvr2_ctl_get_subsys_stream_mask(struct pvr2_hdw *hdw,int ctl_id)
 
 
 static int pvr2_ctl_set_subsys_stream_mask(struct pvr2_hdw *hdw,int ctl_id,
-                                           int val)
+					   int val)
 {
 	pvr2_hdw_subsys_stream_bit_chg_no_lock(hdw,~0,val);
 	return 0;
@@ -1825,7 +1825,7 @@ int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *hdw)
 
 
 int pvr2_hdw_cpufw_get(struct pvr2_hdw *hdw,unsigned int offs,
-                       char *buf,unsigned int cnt)
+		       char *buf,unsigned int cnt)
 {
 	int ret = -EINVAL;
 	LOCK_TAKE(hdw->big_lock); do {
@@ -1922,8 +1922,8 @@ static void pvr2_ctl_timeout(unsigned long data)
 
 
 int pvr2_send_request(struct pvr2_hdw *hdw,
-                      void *write_data,unsigned int write_len,
-                      void *read_data,unsigned int read_len)
+		      void *write_data,unsigned int write_len,
+		      void *read_data,unsigned int read_len)
 {
 	unsigned int idx;
 	int status;
@@ -2324,7 +2324,7 @@ int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl)
 
 
 void pvr2_hdw_get_debug_info(const struct pvr2_hdw *hdw,
-                             struct pvr2_hdw_debug_info *ptr)
+			     struct pvr2_hdw_debug_info *ptr)
 {
 	ptr->big_lock_held = hdw->big_lock_held;
 	ptr->ctl_lock_held = hdw->ctl_lock_held;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-hdw.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index af70b7545..2f9c4cb6d 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-hdw.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -145,7 +145,7 @@
 #define PVR2_SUBSYS_ENC_RUN             (1 <<  4)
 
 #define PVR2_SUBSYS_CFG_ALL ( \
-        PVR2_SUBSYS_ENC_FIRMWARE | \
+	PVR2_SUBSYS_ENC_FIRMWARE | \
 	PVR2_SUBSYS_ENC_CFG )
 #define PVR2_SUBSYS_RUN_ALL ( \
 	PVR2_SUBSYS_DIGITIZER_RUN | \
@@ -235,7 +235,7 @@ const char *pvr2_hdw_get_ctl_name(struct pvr2_hdw *,unsigned int ctl_id);
 /* Retrieve string name for a given control value (returns a null pointer
    for any invalid combinations). */
 const char *pvr2_hdw_get_ctl_value_name(struct pvr2_hdw *,
-                                        unsigned int ctl_id,int value);
+					unsigned int ctl_id,int value);
 
 /* Commit all control changes made up to this point */
 int pvr2_hdw_commit_ctl(struct pvr2_hdw *);
@@ -269,7 +269,7 @@ struct pvr2_stream *pvr2_hdw_get_video_stream(struct pvr2_hdw *);
    identified by bit positions within msk, and new state for each item is
    identified by corresponding bit positions within val. */
 void pvr2_hdw_subsys_bit_chg(struct pvr2_hdw *hdw,
-                             unsigned long msk,unsigned long val);
+			     unsigned long msk,unsigned long val);
 
 /* Shortcut for pvr2_hdw_subsys_bit_chg(hdw,msk,msk) */
 void pvr2_hdw_subsys_bit_set(struct pvr2_hdw *hdw,unsigned long msk);
@@ -284,7 +284,7 @@ unsigned long pvr2_hdw_subsys_get(struct pvr2_hdw *);
 /* Adjust mask of what get shut down when streaming is stopped.  This is a
    debugging aid. */
 void pvr2_hdw_subsys_stream_bit_chg(struct pvr2_hdw *hdw,
-                                    unsigned long msk,unsigned long val);
+				    unsigned long msk,unsigned long val);
 
 /* Retrieve mask indicating which pieces of hardware are disabled when
    streaming is turned off. */
@@ -304,7 +304,7 @@ int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *);
    value is the number of bytes retrieved or zero if we're past the end or
    an error otherwise (e.g. if firmware retrieval is not enabled). */
 int pvr2_hdw_cpufw_get(struct pvr2_hdw *,unsigned int offs,
-                       char *buf,unsigned int cnt);
+		       char *buf,unsigned int cnt);
 
 /* Retrieve previously stored v4l minor device number */
 int pvr2_hdw_v4l_get_minor_number(struct pvr2_hdw *);
@@ -388,7 +388,7 @@ struct pvr2_hdw_debug_info {
    kind of locking and so it is not atomic and may yield inconsistent
    results.  This is *purely* a debugging aid. */
 void pvr2_hdw_get_debug_info(const struct pvr2_hdw *hdw,
-                             struct pvr2_hdw_debug_info *);
+			     struct pvr2_hdw_debug_info *);
 
 /* Cause modules to log their state once */
 void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw);
diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index 2d97653d5..2d97653d5 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index 69864782b..69864782b 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
index fa0a3af7e..fa0a3af7e 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 0c73675b4..e682538ef 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-i2c-core.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -39,9 +39,9 @@ module_param(i2c_scan, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
 
 static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */
-                          u8 i2c_addr,      /* I2C address we're talking to */
-                          u8 *data,         /* Data to write */
-                          u16 length)       /* Size of data to write */
+			  u8 i2c_addr,      /* I2C address we're talking to */
+			  u8 *data,         /* Data to write */
+			  u16 length)       /* Size of data to write */
 {
 	/* Return value - default 0 means success */
 	int ret;
@@ -91,11 +91,11 @@ static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */
 }
 
 static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */
-                         u8 i2c_addr,       /* I2C address we're talking to */
-                         u8 *data,          /* Data to write */
-                         u16 dlen,          /* Size of data to write */
-                         u8 *res,           /* Where to put data we read */
-                         u16 rlen)          /* Amount of data to read */
+			 u8 i2c_addr,       /* I2C address we're talking to */
+			 u8 *data,          /* Data to write */
+			 u16 dlen,          /* Size of data to write */
+			 u8 *res,           /* Where to put data we read */
+			 u16 rlen)          /* Amount of data to read */
 {
 	/* Return value - default 0 means success */
 	int ret;
@@ -160,8 +160,8 @@ static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */
 /* This is a very, very limited I2C adapter implementation.  We can only
    support what we actually know will work on the device... */
 static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap,
-                         struct i2c_msg msgs[],
-                         int num)
+			 struct i2c_msg msgs[],
+			 int num)
 {
 	int ret = -ENOTSUPP;
 	struct pvr2_hdw *hdw = (struct pvr2_hdw *)(i2c_adap->algo_data);
@@ -282,7 +282,7 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap,
 }
 
 static int pvr2_i2c_control(struct i2c_adapter *adapter,
-                            unsigned int cmd, unsigned long arg)
+			    unsigned int cmd, unsigned long arg)
 {
 	return 0;
 }
diff --git a/v4l_experimental/pvrusb2/pvrusb2-i2c-core.h b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h
index e8af5b0ed..e8af5b0ed 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-i2c-core.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-io.c b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
index 0af346591..b01975af4 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-io.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -44,7 +44,7 @@
 		(bp),__FILE__,__LINE__); \
 		pvr2_buffer_describe(bp,"BadSig"); \
 		BUG(); \
-        } \
+	} \
 } while (0)
 #endif
 
@@ -56,7 +56,7 @@
 		(bp),__FILE__,__LINE__); \
 		pvr2_buffer_describe(bp,"BadSig"); \
 		BUG(); \
-        } \
+	} \
 } while (0)
 #else
 #define BUFFER_CHECK(bp) do {} while(0)
@@ -278,8 +278,8 @@ static void pvr2_buffer_wipe(struct pvr2_buffer *bp)
 }
 
 static int pvr2_buffer_init(struct pvr2_buffer *bp,
-                            struct pvr2_stream *sp,
-                            unsigned int id)
+			    struct pvr2_stream *sp,
+			    unsigned int id)
 {
 	memset(bp,0,sizeof(*bp));
 	bp->signature = BUFFER_SIG;
@@ -508,8 +508,8 @@ void pvr2_stream_destroy(struct pvr2_stream *sp)
 }
 
 void pvr2_stream_setup(struct pvr2_stream *sp,
-                       struct usb_device *dev,
-                       int endpoint,
+		       struct usb_device *dev,
+		       int endpoint,
 		       unsigned int tolerance)
 {
 	mutex_lock(&sp->mutex); do {
@@ -521,8 +521,8 @@ void pvr2_stream_setup(struct pvr2_stream *sp,
 }
 
 void pvr2_stream_set_callback(struct pvr2_stream *sp,
-                              pvr2_stream_callback func,
-                              void *data)
+			      pvr2_stream_callback func,
+			      void *data)
 {
 	unsigned long irq_flags;
 	mutex_lock(&sp->mutex); do {
diff --git a/v4l_experimental/pvrusb2/pvrusb2-io.h b/linux/drivers/media/video/pvrusb2/pvrusb2-io.h
index eaa866c92..65e11385b 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-io.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-io.h
@@ -42,11 +42,11 @@ const char *pvr2_buffer_state_decode(enum pvr2_buffer_state);
 struct pvr2_stream *pvr2_stream_create(void);
 void pvr2_stream_destroy(struct pvr2_stream *);
 void pvr2_stream_setup(struct pvr2_stream *,
-                       struct usb_device *dev,int endpoint,
+		       struct usb_device *dev,int endpoint,
 		       unsigned int tolerance);
 void pvr2_stream_set_callback(struct pvr2_stream *,
-                              pvr2_stream_callback func,
-                              void *data);
+			      pvr2_stream_callback func,
+			      void *data);
 
 /* Query / set the nominal buffer count */
 int pvr2_stream_get_buffer_count(struct pvr2_stream *);
diff --git a/v4l_experimental/pvrusb2/pvrusb2-ioread.c b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c
index 4182d75b7..4182d75b7 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-ioread.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c
diff --git a/v4l_experimental/pvrusb2/pvrusb2-ioread.h b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.h
index e6205f123..e6205f123 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-ioread.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-main.c b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
index 0003c7a07..0003c7a07 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-main.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
diff --git a/v4l_experimental/pvrusb2/pvrusb2-sysfs.c b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index f665e79f9..a9710b52c 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-sysfs.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -196,7 +196,7 @@ static ssize_t show_enum(int id,struct class_device *class_dev,char *buf)
 }
 
 static int store_val_any(int id,struct pvr2_sysfs *sfp,
-                         const char *buf,unsigned int count)
+			 const char *buf,unsigned int count)
 {
 	int val,minval,maxval;
 	int ch,ret;
@@ -293,7 +293,7 @@ static int store_val_any(int id,struct pvr2_sysfs *sfp,
 }
 
 static int store_val_multi(int id,struct pvr2_sysfs *sfp,
-                           const char *buf,unsigned int count)
+			   const char *buf,unsigned int count)
 {
 	unsigned int count2;
 	int ret;
@@ -311,7 +311,7 @@ static int store_val_multi(int id,struct pvr2_sysfs *sfp,
 }
 
 static ssize_t store_val_int(int id,struct class_device *class_dev,
-                             const char *buf,size_t count)
+			     const char *buf,size_t count)
 {
 	struct pvr2_sysfs *sfp;
 	int ret;
@@ -322,7 +322,7 @@ static ssize_t store_val_int(int id,struct class_device *class_dev,
 }
 
 static ssize_t store_val_enum(int id,struct class_device *class_dev,
-                              const char *buf,size_t count)
+			      const char *buf,size_t count)
 {
 	struct pvr2_sysfs *sfp;
 	int ret;
@@ -646,7 +646,7 @@ static ssize_t unit_number_show(struct class_device *class_dev,char *buf)
 
 
 static void class_dev_create(struct pvr2_sysfs *sfp,
-                             struct pvr2_sysfs_class *class_ptr)
+			     struct pvr2_sysfs_class *class_ptr)
 {
 	struct usb_device *usb_dev;
 	struct class_device *class_dev;
@@ -707,7 +707,7 @@ static void pvr2_sysfs_internal_check(struct pvr2_channel *chp)
 
 
 struct pvr2_sysfs *pvr2_sysfs_create(struct pvr2_context *mp,
-                                     struct pvr2_sysfs_class *class_ptr)
+				     struct pvr2_sysfs_class *class_ptr)
 {
 	struct pvr2_sysfs *sfp;
 	sfp = kmalloc(sizeof(*sfp),GFP_KERNEL);
@@ -723,7 +723,7 @@ struct pvr2_sysfs *pvr2_sysfs_create(struct pvr2_context *mp,
 
 
 static int pvr2_sysfs_hotplug(struct class_device *cd,char **envp,
-                              int numenvp,char *buf,int size)
+			      int numenvp,char *buf,int size)
 {
 	/* Even though we don't do anything here, we still need this function
 	   because sysfs will still try to call it. */
@@ -781,7 +781,7 @@ static ssize_t debugcmd_show(struct class_device *class_dev,char *buf)
 
 
 static ssize_t debugcmd_store(struct class_device *class_dev,
-                              const char *buf,size_t count)
+			      const char *buf,size_t count)
 {
 	struct pvr2_sysfs *sfp;
 	int ret;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-sysfs.h b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.h
index 150260e90..ff9373b47 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-sysfs.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.h
@@ -32,7 +32,7 @@ struct pvr2_sysfs_class *pvr2_sysfs_class_create(void);
 void pvr2_sysfs_class_destroy(struct pvr2_sysfs_class *);
 
 struct pvr2_sysfs *pvr2_sysfs_create(struct pvr2_context *,
-                                     struct pvr2_sysfs_class *);
+				     struct pvr2_sysfs_class *);
 
 #endif /* __PVRUSB2_SYSFS_H */
 
diff --git a/v4l_experimental/pvrusb2/pvrusb2-tuner.c b/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c
index f829c0acc..f829c0acc 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-tuner.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c
diff --git a/v4l_experimental/pvrusb2/pvrusb2-tuner.h b/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.h
index 556f12aa9..556f12aa9 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-tuner.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-util.h b/linux/drivers/media/video/pvrusb2/pvrusb2-util.h
index c1c6d77fb..e53aee416 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-util.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-util.h
@@ -23,18 +23,18 @@
 
 #define PVR2_DECOMPOSE_LE(t,i,d) \
     do {    \
-        (t)[i] = (d) & 0xff;\
-        (t)[i+1] = ((d) >> 8) & 0xff;\
-        (t)[i+2] = ((d) >> 16) & 0xff;\
-        (t)[i+3] = ((d) >> 24) & 0xff;\
+	(t)[i] = (d) & 0xff;\
+	(t)[i+1] = ((d) >> 8) & 0xff;\
+	(t)[i+2] = ((d) >> 16) & 0xff;\
+	(t)[i+3] = ((d) >> 24) & 0xff;\
     } while(0)
 
 #define PVR2_DECOMPOSE_BE(t,i,d) \
     do {    \
-        (t)[i+3] = (d) & 0xff;\
-        (t)[i+2] = ((d) >> 8) & 0xff;\
-        (t)[i+1] = ((d) >> 16) & 0xff;\
-        (t)[i] = ((d) >> 24) & 0xff;\
+	(t)[i+3] = (d) & 0xff;\
+	(t)[i+2] = ((d) >> 8) & 0xff;\
+	(t)[i+1] = ((d) >> 16) & 0xff;\
+	(t)[i] = ((d) >> 24) & 0xff;\
     } while(0)
 
 #define PVR2_COMPOSE_LE(t,i) \
diff --git a/v4l_experimental/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 4beea06b0..ba99db26c 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -342,7 +342,7 @@ static int cnv_cid_pvr2_v4l2(int id)
  *
  */
 static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
-                              unsigned int cmd, void *arg)
+			      unsigned int cmd, void *arg)
 {
 	struct pvr2_v4l2_fh *fh = file->private_data;
 	struct pvr2_v4l2 *vp = fh->vhead;
@@ -905,7 +905,7 @@ void pvr2_v4l2_internal_check(struct pvr2_channel *chp)
 
 
 int pvr2_v4l2_ioctl(struct inode *inode, struct file *file,
-                    unsigned int cmd, unsigned long arg)
+		    unsigned int cmd, unsigned long arg)
 {
 
 /* Temporary hack : use ivtv api until a v4l2 one is available. */
@@ -1053,7 +1053,7 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh)
 
 
 static ssize_t pvr2_v4l2_read(struct file *file,
-                              char __user *buff, size_t count, loff_t *ppos)
+			      char __user *buff, size_t count, loff_t *ppos)
 {
 	struct pvr2_v4l2_fh *fh = file->private_data;
 	int ret;
@@ -1165,8 +1165,8 @@ static struct video_device vdev_template = {
 
 
 static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
-                               struct pvr2_v4l2 *vp,
-                               enum pvr2_config cfg)
+			       struct pvr2_v4l2 *vp,
+			       enum pvr2_config cfg)
 {
 #ifdef notdef
 	struct usb_device *usbdev;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-v4l2.h b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.h
index 9a995e2d2..9a995e2d2 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-v4l2.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index 96a748dde..d0bc3682b 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -131,7 +131,7 @@ static int decoder_check(struct pvr2_v4l_decoder *ctxt)
 	unsigned long msk;
 	unsigned int idx;
 
-	for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]); 
+	for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
 	     idx++) {
 		msk = 1 << idx;
 		if (ctxt->stale_mask & msk) continue;
@@ -148,7 +148,7 @@ static void decoder_update(struct pvr2_v4l_decoder *ctxt)
 	unsigned long msk;
 	unsigned int idx;
 
-	for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]); 
+	for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
 	     idx++) {
 		msk = 1 << idx;
 		if (!(ctxt->stale_mask & msk)) continue;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.h b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h
index 1c0c98efb..1c0c98efb 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h
diff --git a/v4l_experimental/pvrusb2/pvrusb2.h b/linux/drivers/media/video/pvrusb2/pvrusb2.h
index 074533e9c..074533e9c 100644
--- a/v4l_experimental/pvrusb2/pvrusb2.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2.h