diff options
author | Oliver Endriss <o.endriss@gmx.de> | 2010-02-03 16:59:20 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:10:55 -0500 |
commit | 684688d87d697724c46be77858641ee2e8885b02 (patch) | |
tree | aa44ac65ca876b3b71f8e4936d8e6f8c88302680 /drivers/media/dvb/ngene/ngene-core.c | |
parent | e890e7c0426ab99b032d5b387b1ca9fad6928895 (diff) |
V4L/DVB: ngene: Make checkpatch.pl happy
Make checkpatch.pl happy.
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ngene/ngene-core.c')
-rw-r--r-- | drivers/media/dvb/ngene/ngene-core.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c index 1bb9bc78573..1b53482f6e7 100644 --- a/drivers/media/dvb/ngene/ngene-core.c +++ b/drivers/media/dvb/ngene/ngene-core.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include <linux/poll.h> | 34 | #include <linux/poll.h> |
35 | #include <asm/io.h> | 35 | #include <linux/io.h> |
36 | #include <asm/div64.h> | 36 | #include <asm/div64.h> |
37 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
38 | #include <linux/pci_ids.h> | 38 | #include <linux/pci_ids.h> |
@@ -267,11 +267,13 @@ static void dump_command_io(struct ngene *dev) | |||
267 | 267 | ||
268 | ngcpyfrom(buf, HOST_TO_NGENE, 8); | 268 | ngcpyfrom(buf, HOST_TO_NGENE, 8); |
269 | printk(KERN_ERR "host_to_ngene (%04x): %02x %02x %02x %02x %02x %02x %02x %02x\n", | 269 | printk(KERN_ERR "host_to_ngene (%04x): %02x %02x %02x %02x %02x %02x %02x %02x\n", |
270 | HOST_TO_NGENE, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); | 270 | HOST_TO_NGENE, buf[0], buf[1], buf[2], buf[3], |
271 | buf[4], buf[5], buf[6], buf[7]); | ||
271 | 272 | ||
272 | ngcpyfrom(buf, NGENE_TO_HOST, 8); | 273 | ngcpyfrom(buf, NGENE_TO_HOST, 8); |
273 | printk(KERN_ERR "ngene_to_host (%04x): %02x %02x %02x %02x %02x %02x %02x %02x\n", | 274 | printk(KERN_ERR "ngene_to_host (%04x): %02x %02x %02x %02x %02x %02x %02x %02x\n", |
274 | NGENE_TO_HOST, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); | 275 | NGENE_TO_HOST, buf[0], buf[1], buf[2], buf[3], |
276 | buf[4], buf[5], buf[6], buf[7]); | ||
275 | 277 | ||
276 | b = dev->hosttongene; | 278 | b = dev->hosttongene; |
277 | printk(KERN_ERR "dev->hosttongene (%p): %02x %02x %02x %02x %02x %02x %02x %02x\n", | 279 | printk(KERN_ERR "dev->hosttongene (%p): %02x %02x %02x %02x %02x %02x %02x %02x\n", |
@@ -1198,7 +1200,7 @@ static int AllocateRingBuffers(struct pci_dev *pci_dev, | |||
1198 | * sizeof(struct HW_SCATTER_GATHER_ELEMENT); | 1200 | * sizeof(struct HW_SCATTER_GATHER_ELEMENT); |
1199 | 1201 | ||
1200 | u64 PASCListMem; | 1202 | u64 PASCListMem; |
1201 | PHW_SCATTER_GATHER_ELEMENT SCListEntry; | 1203 | struct HW_SCATTER_GATHER_ELEMENT *SCListEntry; |
1202 | u64 PASCListEntry; | 1204 | u64 PASCListEntry; |
1203 | struct SBufferHeader *Cur; | 1205 | struct SBufferHeader *Cur; |
1204 | void *SCListMem; | 1206 | void *SCListMem; |
@@ -1220,7 +1222,7 @@ static int AllocateRingBuffers(struct pci_dev *pci_dev, | |||
1220 | pRingBuffer->Buffer1Length = Buffer1Length; | 1222 | pRingBuffer->Buffer1Length = Buffer1Length; |
1221 | pRingBuffer->Buffer2Length = Buffer2Length; | 1223 | pRingBuffer->Buffer2Length = Buffer2Length; |
1222 | 1224 | ||
1223 | SCListEntry = (PHW_SCATTER_GATHER_ELEMENT) SCListMem; | 1225 | SCListEntry = SCListMem; |
1224 | PASCListEntry = PASCListMem; | 1226 | PASCListEntry = PASCListMem; |
1225 | Cur = pRingBuffer->Head; | 1227 | Cur = pRingBuffer->Head; |
1226 | 1228 | ||
@@ -1611,10 +1613,10 @@ static int ngene_start(struct ngene *dev) | |||
1611 | goto fail; | 1613 | goto fail; |
1612 | 1614 | ||
1613 | if (dev->card_info->fw_version == 17) { | 1615 | if (dev->card_info->fw_version == 17) { |
1614 | u8 tsin4_config[6] = | 1616 | u8 tsin4_config[6] = { |
1615 | {3072 / 64, 3072 / 64, 0, 3072 / 64, 3072 / 64, 0}; | 1617 | 3072 / 64, 3072 / 64, 0, 3072 / 64, 3072 / 64, 0}; |
1616 | u8 default_config[6] = | 1618 | u8 default_config[6] = { |
1617 | {4096 / 64, 4096 / 64, 0, 2048 / 64, 2048 / 64, 0}; | 1619 | 4096 / 64, 4096 / 64, 0, 2048 / 64, 2048 / 64, 0}; |
1618 | u8 *bconf = default_config; | 1620 | u8 *bconf = default_config; |
1619 | 1621 | ||
1620 | if (dev->card_info->io_type[3] == NGENE_IO_TSIN) | 1622 | if (dev->card_info->io_type[3] == NGENE_IO_TSIN) |