From 2e732d64416b243883f753e4a00960c3f3709317 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Sat, 31 Jul 2010 16:51:23 -0300 Subject: [PATCH] [media] saa7164: Some whitespace cleanup Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/saa7164/saa7164-api.c | 6 ++---- drivers/media/video/saa7164/saa7164-bus.c | 2 ++ drivers/media/video/saa7164/saa7164-cards.c | 3 --- drivers/media/video/saa7164/saa7164-core.c | 1 - drivers/media/video/saa7164/saa7164-dvb.c | 2 -- drivers/media/video/saa7164/saa7164-encoder.c | 2 -- drivers/media/video/saa7164/saa7164-vbi.c | 2 -- drivers/media/video/saa7164/saa7164.h | 1 - 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 d05ba28cab2a..045d9094d9ad 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) SU_INPUT_SELECT_CONTROL, sizeof(u8), &port->mux_input); if (ret != SAA_OK) printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); + /* Audio Mux */ ret = saa7164_cmd_send(port->dev, port->audfeat.sourceid, SET_CUR, SU_INPUT_SELECT_CONTROL, sizeof(u8), &inputs[ port->mux_input - 1 ]); if (ret != SAA_OK) printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); + /* Audio UnMute */ ret = saa7164_api_audio_mute(port, 0); if (ret != SAA_OK) @@ -795,7 +797,6 @@ int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen) ®[0], 128, buf); } - int saa7164_api_configure_port_vbi(struct saa7164_dev *dev, struct saa7164_port *port) { @@ -1459,7 +1460,6 @@ int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr, u32 datalen, return ret == SAA_OK ? 0 : -EIO; } - int saa7164_api_modify_gpio(struct saa7164_dev *dev, u8 unitid, u8 pin, u8 state) { @@ -1496,5 +1496,3 @@ int saa7164_api_clear_gpiobit(struct saa7164_dev *dev, u8 unitid, return saa7164_api_modify_gpio(dev, unitid, pin, 0); } - - diff --git a/drivers/media/video/saa7164/saa7164-bus.c b/drivers/media/video/saa7164/saa7164-bus.c index 0e76538cabb0..78ccf1acdc5c 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) } dprintk(DBGLVL_BUS, "%s()\n", __func__); + saa7164_bus_verify(dev); msg->size = cpu_to_le16(msg->size); @@ -309,6 +310,7 @@ int saa7164_bus_get(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf, int ret = SAA_ERR_BAD_PARAMETER; saa7164_bus_verify(dev); + if (msg == 0) return ret; diff --git a/drivers/media/video/saa7164/saa7164-cards.c b/drivers/media/video/saa7164/saa7164-cards.c index dc2889abb337..4cb634e952a6 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) void saa7164_gpio_setup(struct saa7164_dev *dev) { - - switch (dev->board) { case SAA7164_BOARD_HAUPPAUGE_HVR2200: case SAA7164_BOARD_HAUPPAUGE_HVR2200_2: @@ -490,7 +488,6 @@ void saa7164_gpio_setup(struct saa7164_dev *dev) saa7164_api_set_gpiobit(dev, PCIEBRIDGE_UNITID, 3); break; } - } static 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 5913ed75cb90..222fbda0cb78 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, saa7164_gpio_setup(dev); saa7164_card_setup(dev); - /* Parse the dynamic device configuration, find various * media endpoints (MPEG, WMV, PS, TS) and cache their * 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 ffa1c970d1cd..2d21c01dea29 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) return -1; } - /* Put the analog decoder in standby to keep it quiet */ - /* register everything */ ret = dvb_register(port); if (ret < 0) { diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c index 22c7d8ad7256..0d317aefec2f 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, static int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t) { - /* Update the A/V core */ - return 0; } diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c index bfffb5d74220..f6211c91b88e 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, static int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t) { - /* Update the A/V core */ - return 0; } diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h index 329564452e27..f16b3f961199 100644 --- a/drivers/media/video/saa7164/saa7164.h +++ b/drivers/media/video/saa7164/saa7164.h @@ -621,7 +621,6 @@ extern unsigned int saa_debug; #define saa7164_readl(reg) readl(dev->lmmio + ((reg) >> 2)) #define saa7164_writel(reg, value) writel((value), dev->lmmio + ((reg) >> 2)) - #define saa7164_readb(reg) readl(dev->bmmio + (reg)) #define saa7164_writeb(reg, value) writel((value), dev->bmmio + (reg)) -- 2.20.1