diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-14 13:29:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-14 13:29:42 -0300 |
| commit | 015736e16a8af8a8fe96379031c6a637f4f3a1cb (patch) | |
| tree | 4a4553e4adfaba823d15794482387264721ee553 /linux/drivers/media | |
| parent | 4c6d792a82b4304ed6ccbfccf9f5ed693a3349e2 (diff) | |
| download | mediapointer-dvb-s2-015736e16a8af8a8fe96379031c6a637f4f3a1cb.tar.gz mediapointer-dvb-s2-015736e16a8af8a8fe96379031c6a637f4f3a1cb.tar.bz2 | |
backport a few minor cleanups
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/firewire/firedtv-avc.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/drx397xD.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/au0828/au0828-video.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dsp.c | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/firewire/firedtv-avc.c b/linux/drivers/media/dvb/firewire/firedtv-avc.c index e95a6f094..620fa2c65 100644 --- a/linux/drivers/media/dvb/firewire/firedtv-avc.c +++ b/linux/drivers/media/dvb/firewire/firedtv-avc.c @@ -115,7 +115,7 @@ static const char *debug_fcp_ctype(unsigned int ctype) } static const char *debug_fcp_opcode(unsigned int opcode, - const u8 *data, size_t length) + const u8 *data, int length) { switch (opcode) { case AVC_OPCODE_VENDOR: break; @@ -142,7 +142,7 @@ static const char *debug_fcp_opcode(unsigned int opcode, return "Vendor"; } -static void debug_fcp(const u8 *data, size_t length) +static void debug_fcp(const u8 *data, int length) { unsigned int subunit_type, subunit_id, op; const char *prefix = data[0] > 7 ? "FCP <- " : "FCP -> "; diff --git a/linux/drivers/media/dvb/frontends/drx397xD.c b/linux/drivers/media/dvb/frontends/drx397xD.c index 6b3927e8b..0bdb933d0 100644 --- a/linux/drivers/media/dvb/frontends/drx397xD.c +++ b/linux/drivers/media/dvb/frontends/drx397xD.c @@ -75,7 +75,7 @@ static struct { } fw[] = { #define _FW_ENTRY(a, b, c) { \ .name = a, \ - .file = 0, \ + .file = NULL, \ .lock = __RW_LOCK_UNLOCKED(fw[c].lock), \ .refcnt = 0, \ .data = { } } diff --git a/linux/drivers/media/video/au0828/au0828-video.c b/linux/drivers/media/video/au0828/au0828-video.c index a19d7ba10..8bc0f0481 100644 --- a/linux/drivers/media/video/au0828/au0828-video.c +++ b/linux/drivers/media/video/au0828/au0828-video.c @@ -33,7 +33,6 @@ #include <linux/device.h> #include <linux/suspend.h> #include <linux/version.h> -#include <linux/mm.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-chip-ident.h> diff --git a/linux/drivers/media/video/cx88/cx88-dsp.c b/linux/drivers/media/video/cx88/cx88-dsp.c index 4699055f2..dfe2cfce4 100644 --- a/linux/drivers/media/video/cx88/cx88-dsp.c +++ b/linux/drivers/media/video/cx88/cx88-dsp.c @@ -111,8 +111,8 @@ static u32 int_goertzel(s16 x[], u32 N, u32 freq) s_prev = s; } - tmp = (s64)s_prev2*s_prev2 + (s64)s_prev*s_prev - - (s64)coeff*s_prev2*s_prev/32768; + tmp = (s64)s_prev2 * s_prev2 + (s64)s_prev * s_prev - + (s64)coeff * s_prev2 * s_prev / 32768; /* XXX: N must be low enough so that N*N fits in s32. * Else we need two divisions. */ |