---

yaml --- r: 250133 b: refs/heads/master c: 7fc7356 h: refs/heads/master i: 250131: e433e5a v: v3
git-mirror · May 20, 2011 · 334b6d3 · 334b6d3
1 parent 0f92b23
commit 334b6d3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bccd2d8a39a65b008e5af96404139c2260a42fc7
+refs/heads/master: 7fc7356f4eafa953197e1c4e2d236e199a51db28
diff --git a/trunk/drivers/media/dvb/frontends/drxd.h b/trunk/drivers/media/dvb/frontends/drxd.h
@@ -49,7 +49,7 @@ struct drxd_config {
 
 	u32 IF;
 	int (*pll_set) (void *priv, void *priv_params,
-			u8 pll_addr, u8 demoda_addr, s32 * off);
+			u8 pll_addr, u8 demoda_addr, s32 *off);
 	 s16(*osc_deviation) (void *priv, s16 dev, int flag);
 };
 

diff --git a/trunk/drivers/media/dvb/frontends/drxd_firm.c b/trunk/drivers/media/dvb/frontends/drxd_firm.c
@@ -36,10 +36,10 @@
 /* Is written via block write, must be little endian */
 #define DATA16(x)      ((x) & 0xFF), (((x)>>8) & 0xFF)
 
-#define WRBLOCK(a,l) ADDRESS(a),LENGTH(l)
-#define WR16(a,d) ADDRESS(a),LENGTH(1),DATA16(d)
+#define WRBLOCK(a, l) ADDRESS(a), LENGTH(l)
+#define WR16(a, d) ADDRESS(a), LENGTH(1), DATA16(d)
 
-#define END_OF_TABLE      0xFF,0xFF,0xFF,0xFF
+#define END_OF_TABLE      0xFF, 0xFF, 0xFF, 0xFF
 
 /* HI firmware patches */
 
@@ -63,7 +63,7 @@ u8 DRXD_InitAtomicRead[] = {
 /* Pins D0 and D1 of the parallel MPEG output can be used
    to set the I2C address of a device. */
 
-#define HI_RST_FUNC_ADDR ( HI_IF_RAM_USR_BEGIN__A + HI_TR_FUNC_SIZE)
+#define HI_RST_FUNC_ADDR (HI_IF_RAM_USR_BEGIN__A + HI_TR_FUNC_SIZE)
 #define HI_RST_FUNC_SIZE 54	/* size of this function in instruction words */
 
 /* D0 Version */

diff --git a/trunk/drivers/media/dvb/frontends/drxd_hard.c b/trunk/drivers/media/dvb/frontends/drxd_hard.c
@@ -2782,12 +2782,8 @@ struct dvb_frontend *drxd_attach(const struct drxd_config *config,
 	if (Read16(state, 0, 0, 0) < 0)
 		goto error;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-	state->frontend.ops = &state->ops;
-#else
 	memcpy(&state->frontend.ops, &drxd_ops,
 	       sizeof(struct dvb_frontend_ops));
-#endif
 	state->frontend.demodulator_priv = state;
 	ConfigureMPEGOutput(state, 0);
 	return &state->frontend;