summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-03-25 10:54:03 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 07:26:25 -0300
commit7fc7356f4eafa953197e1c4e2d236e199a51db28 (patch)
treedcf4a62daaa0635626d35e8ca96c3416089a6852
parentbccd2d8a39a65b008e5af96404139c2260a42fc7 (diff)
downloadlwn-7fc7356f4eafa953197e1c4e2d236e199a51db28.tar.gz
lwn-7fc7356f4eafa953197e1c4e2d236e199a51db28.zip
[media] drxd: Fix some CodingStyle issues
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/frontends/drxd.h2
-rw-r--r--drivers/media/dvb/frontends/drxd_firm.c8
-rw-r--r--drivers/media/dvb/frontends/drxd_hard.c4
3 files changed, 5 insertions, 9 deletions
diff --git a/drivers/media/dvb/frontends/drxd.h b/drivers/media/dvb/frontends/drxd.h
index d3d6c9246535..7113535844f2 100644
--- a/drivers/media/dvb/frontends/drxd.h
+++ b/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/drivers/media/dvb/frontends/drxd_firm.c b/drivers/media/dvb/frontends/drxd_firm.c
index 2949bde426b2..5418b0b1dadc 100644
--- a/drivers/media/dvb/frontends/drxd_firm.c
+++ b/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/drivers/media/dvb/frontends/drxd_hard.c b/drivers/media/dvb/frontends/drxd_hard.c
index ed6c529946dd..e4440af31cd2 100644
--- a/drivers/media/dvb/frontends/drxd_hard.c
+++ b/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;