aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7164
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2010-07-31 15:51:23 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 05:55:18 -0400
commit2e732d64416b243883f753e4a00960c3f3709317 (patch)
tree045a9a4a8031316eb1ef33f51415aedc91070e6a /drivers/media/video/saa7164
parent3dee4317b72bcb2d1f1ecee1b2bd8950eec2ff7f (diff)
[media] saa7164: Some whitespace cleanup
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7164')
-rw-r--r--drivers/media/video/saa7164/saa7164-api.c6
-rw-r--r--drivers/media/video/saa7164/saa7164-bus.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-cards.c3
-rw-r--r--drivers/media/video/saa7164/saa7164-core.c1
-rw-r--r--drivers/media/video/saa7164/saa7164-dvb.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-encoder.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-vbi.c2
-rw-r--r--drivers/media/video/saa7164/saa7164.h1
8 files changed, 4 insertions, 15 deletions
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c
index d05ba28cab2..045d9094d9a 100644
--- a/drivers/media/video/saa7164/saa7164-api.c
+++ b/drivers/media/video/saa7164/saa7164-api.c
@@ -436,11 +436,13 @@ int saa7164_api_set_videomux(struct saa7164_port *port)
436 SU_INPUT_SELECT_CONTROL, sizeof(u8), &port->mux_input); 436 SU_INPUT_SELECT_CONTROL, sizeof(u8), &port->mux_input);
437 if (ret != SAA_OK) 437 if (ret != SAA_OK)
438 printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); 438 printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
439
439 /* Audio Mux */ 440 /* Audio Mux */
440 ret = saa7164_cmd_send(port->dev, port->audfeat.sourceid, SET_CUR, 441 ret = saa7164_cmd_send(port->dev, port->audfeat.sourceid, SET_CUR,
441 SU_INPUT_SELECT_CONTROL, sizeof(u8), &inputs[ port->mux_input - 1 ]); 442 SU_INPUT_SELECT_CONTROL, sizeof(u8), &inputs[ port->mux_input - 1 ]);
442 if (ret != SAA_OK) 443 if (ret != SAA_OK)
443 printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); 444 printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
445
444 /* Audio UnMute */ 446 /* Audio UnMute */
445 ret = saa7164_api_audio_mute(port, 0); 447 ret = saa7164_api_audio_mute(port, 0);
446 if (ret != SAA_OK) 448 if (ret != SAA_OK)
@@ -795,7 +797,6 @@ int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen)
795 &reg[0], 128, buf); 797 &reg[0], 128, buf);
796} 798}
797 799
798
799int saa7164_api_configure_port_vbi(struct saa7164_dev *dev, 800int saa7164_api_configure_port_vbi(struct saa7164_dev *dev,
800 struct saa7164_port *port) 801 struct saa7164_port *port)
801{ 802{
@@ -1459,7 +1460,6 @@ int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr, u32 datalen,
1459 return ret == SAA_OK ? 0 : -EIO; 1460 return ret == SAA_OK ? 0 : -EIO;
1460} 1461}
1461 1462
1462
1463int saa7164_api_modify_gpio(struct saa7164_dev *dev, u8 unitid, 1463int saa7164_api_modify_gpio(struct saa7164_dev *dev, u8 unitid,
1464 u8 pin, u8 state) 1464 u8 pin, u8 state)
1465{ 1465{
@@ -1496,5 +1496,3 @@ int saa7164_api_clear_gpiobit(struct saa7164_dev *dev, u8 unitid,
1496 return saa7164_api_modify_gpio(dev, unitid, pin, 0); 1496 return saa7164_api_modify_gpio(dev, unitid, pin, 0);
1497} 1497}
1498 1498
1499
1500
diff --git a/drivers/media/video/saa7164/saa7164-bus.c b/drivers/media/video/saa7164/saa7164-bus.c
index 0e76538cabb..78ccf1acdc5 100644
--- a/drivers/media/video/saa7164/saa7164-bus.c
+++ b/drivers/media/video/saa7164/saa7164-bus.c
@@ -142,6 +142,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf)
142 } 142 }
143 143
144 dprintk(DBGLVL_BUS, "%s()\n", __func__); 144 dprintk(DBGLVL_BUS, "%s()\n", __func__);
145
145 saa7164_bus_verify(dev); 146 saa7164_bus_verify(dev);
146 147
147 msg->size = cpu_to_le16(msg->size); 148 msg->size = cpu_to_le16(msg->size);
@@ -309,6 +310,7 @@ int saa7164_bus_get(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf,
309 int ret = SAA_ERR_BAD_PARAMETER; 310 int ret = SAA_ERR_BAD_PARAMETER;
310 311
311 saa7164_bus_verify(dev); 312 saa7164_bus_verify(dev);
313
312 if (msg == 0) 314 if (msg == 0)
313 return ret; 315 return ret;
314 316
diff --git a/drivers/media/video/saa7164/saa7164-cards.c b/drivers/media/video/saa7164/saa7164-cards.c
index dc2889abb33..4cb634e952a 100644
--- a/drivers/media/video/saa7164/saa7164-cards.c
+++ b/drivers/media/video/saa7164/saa7164-cards.c
@@ -465,8 +465,6 @@ void saa7164_card_list(struct saa7164_dev *dev)
465 465
466void saa7164_gpio_setup(struct saa7164_dev *dev) 466void saa7164_gpio_setup(struct saa7164_dev *dev)
467{ 467{
468
469
470 switch (dev->board) { 468 switch (dev->board) {
471 case SAA7164_BOARD_HAUPPAUGE_HVR2200: 469 case SAA7164_BOARD_HAUPPAUGE_HVR2200:
472 case SAA7164_BOARD_HAUPPAUGE_HVR2200_2: 470 case SAA7164_BOARD_HAUPPAUGE_HVR2200_2:
@@ -490,7 +488,6 @@ void saa7164_gpio_setup(struct saa7164_dev *dev)
490 saa7164_api_set_gpiobit(dev, PCIEBRIDGE_UNITID, 3); 488 saa7164_api_set_gpiobit(dev, PCIEBRIDGE_UNITID, 3);
491 break; 489 break;
492 } 490 }
493
494} 491}
495 492
496static void hauppauge_eeprom(struct saa7164_dev *dev, u8 *eeprom_data) 493static void hauppauge_eeprom(struct saa7164_dev *dev, u8 *eeprom_data)
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c
index 5913ed75cb9..222fbda0cb7 100644
--- a/drivers/media/video/saa7164/saa7164-core.c
+++ b/drivers/media/video/saa7164/saa7164-core.c
@@ -1329,7 +1329,6 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev,
1329 saa7164_gpio_setup(dev); 1329 saa7164_gpio_setup(dev);
1330 saa7164_card_setup(dev); 1330 saa7164_card_setup(dev);
1331 1331
1332
1333 /* Parse the dynamic device configuration, find various 1332 /* Parse the dynamic device configuration, find various
1334 * media endpoints (MPEG, WMV, PS, TS) and cache their 1333 * media endpoints (MPEG, WMV, PS, TS) and cache their
1335 * configuration details into the driver, so we can 1334 * configuration details into the driver, so we can
diff --git a/drivers/media/video/saa7164/saa7164-dvb.c b/drivers/media/video/saa7164/saa7164-dvb.c
index ffa1c970d1c..2d21c01dea2 100644
--- a/drivers/media/video/saa7164/saa7164-dvb.c
+++ b/drivers/media/video/saa7164/saa7164-dvb.c
@@ -531,8 +531,6 @@ int saa7164_dvb_register(struct saa7164_port *port)
531 return -1; 531 return -1;
532 } 532 }
533 533
534 /* Put the analog decoder in standby to keep it quiet */
535
536 /* register everything */ 534 /* register everything */
537 ret = dvb_register(port); 535 ret = dvb_register(port);
538 if (ret < 0) { 536 if (ret < 0) {
diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
index 22c7d8ad725..0d317aefec2 100644
--- a/drivers/media/video/saa7164/saa7164-encoder.c
+++ b/drivers/media/video/saa7164/saa7164-encoder.c
@@ -314,9 +314,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
314static int vidioc_s_tuner(struct file *file, void *priv, 314static int vidioc_s_tuner(struct file *file, void *priv,
315 struct v4l2_tuner *t) 315 struct v4l2_tuner *t)
316{ 316{
317
318 /* Update the A/V core */ 317 /* Update the A/V core */
319
320 return 0; 318 return 0;
321} 319}
322 320
diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
index bfffb5d7422..f6211c91b88 100644
--- a/drivers/media/video/saa7164/saa7164-vbi.c
+++ b/drivers/media/video/saa7164/saa7164-vbi.c
@@ -288,9 +288,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
288static int vidioc_s_tuner(struct file *file, void *priv, 288static int vidioc_s_tuner(struct file *file, void *priv,
289 struct v4l2_tuner *t) 289 struct v4l2_tuner *t)
290{ 290{
291
292 /* Update the A/V core */ 291 /* Update the A/V core */
293
294 return 0; 292 return 0;
295} 293}
296 294
diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h
index 329564452e2..f16b3f96119 100644
--- a/drivers/media/video/saa7164/saa7164.h
+++ b/drivers/media/video/saa7164/saa7164.h
@@ -621,7 +621,6 @@ extern unsigned int saa_debug;
621#define saa7164_readl(reg) readl(dev->lmmio + ((reg) >> 2)) 621#define saa7164_readl(reg) readl(dev->lmmio + ((reg) >> 2))
622#define saa7164_writel(reg, value) writel((value), dev->lmmio + ((reg) >> 2)) 622#define saa7164_writel(reg, value) writel((value), dev->lmmio + ((reg) >> 2))
623 623
624
625#define saa7164_readb(reg) readl(dev->bmmio + (reg)) 624#define saa7164_readb(reg) readl(dev->bmmio + (reg))
626#define saa7164_writeb(reg, value) writel((value), dev->bmmio + (reg)) 625#define saa7164_writeb(reg, value) writel((value), dev->bmmio + (reg))
627 626