[linux-dvb] Patch 35 / 50: code cleanup for sp887x

Uwe Bugla uwe.bugla at gmx.de
Fri Jun 23 17:27:01 CEST 2006


#Applies against: 2.6.17
#Signed-off-by: Uwe Bugla <uwe.bugla at gmx.de>
#Changes: fix type and / or tab errors, extracts documentary parts out of the module and transforms them into a documenatary text file
--- a/drivers/media/dvb/frontends/sp887x.c	2006-03-20 06:53:00
+++ b/drivers/media/dvb/frontends/sp887x.c	2006-05-28 20:42:00
@@ -1,26 +1,15 @@
+/* Driver for the Spase sp887x demodulator */
-/*
-   Driver for the Spase sp887x demodulator
-*/
 
-/*
- * This driver needs external firmware. Please use the command
- * "<kerneldir>/Documentation/dvb/get_dvb_firmware sp887x" to
- * download/extract it, and then copy it to /usr/lib/hotplug/firmware
- * or /lib/firmware (depending on configuration of firmware hotplug).
- */
 #define SP887X_DEFAULT_FIRMWARE "dvb-fe-sp887x.fw"
-
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-
 #include "dvb_frontend.h"
 #include "sp887x.h"
-
 
 struct sp887x_state {
 	struct i2c_adapter* i2c;
@@ -412,18 +401,9 @@
 	u16 snr12 = sp887x_readreg(state, 0xf16);
 	u16 sync0x200 = sp887x_readreg(state, 0x200);
 	u16 sync0xf17 = sp887x_readreg(state, 0xf17);
-
 	*status = 0;
-
 	if (snr12 > 0x00f)
 		*status |= FE_HAS_SIGNAL;
-
-	//if (sync0x200 & 0x004)
-	//	*status |= FE_HAS_SYNC | FE_HAS_CARRIER;
-
-	//if (sync0x200 & 0x008)
-	//	*status |= FE_HAS_VITERBI;
-
 	if ((sync0xf17 & 0x00f) == 0x002) {
 		*status |= FE_HAS_LOCK;
 		*status |= FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_CARRIER;
@@ -565,8 +545,7 @@
 	state->frontend.ops = &state->ops;
 	state->frontend.demodulator_priv = state;
 	return &state->frontend;
-
-error:
+ error:
 	kfree(state);
 	return NULL;
 }
--- a/dev/null					2006-03-20 06:53:00
+++ b/Documentation/dvb/sp887x.txt		2006-05-28 12:11:00
@@ -0,0 +1,4 @@
+Driver for the Spase sp887x demodulator
+
+This driver needs external firmware. Please use the command *get_dvb_firmware sp887x" to download/extract it,
+and then copy it to /usr/lib/hotplug/firmware or /lib/firmware (depending on configuration of firmware hotplug).

-- 


"Feel free" – 10 GB Mailbox, 100 FreeSMS/Monat ...
Jetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail



More information about the linux-dvb mailing list