aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7164
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7164')
-rw-r--r--drivers/media/video/saa7164/saa7164-vbi.c4
-rw-r--r--drivers/media/video/saa7164/saa7164.h5
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
index 273cf807401c..d8e6c8f14079 100644
--- a/drivers/media/video/saa7164/saa7164-vbi.c
+++ b/drivers/media/video/saa7164/saa7164-vbi.c
@@ -952,7 +952,7 @@ static int saa7164_vbi_start_streaming(struct saa7164_port *port)
952 952
953 /* Stop the hardware, regardless */ 953 /* Stop the hardware, regardless */
954 result = saa7164_vbi_stop_port(port); 954 result = saa7164_vbi_stop_port(port);
955 if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) { 955 if (result != SAA_OK) {
956 printk(KERN_ERR "%s() pause/forced stop transition " 956 printk(KERN_ERR "%s() pause/forced stop transition "
957 "failed, res = 0x%x\n", __func__, result); 957 "failed, res = 0x%x\n", __func__, result);
958 } 958 }
@@ -971,7 +971,7 @@ static int saa7164_vbi_start_streaming(struct saa7164_port *port)
971 /* Stop the hardware, regardless */ 971 /* Stop the hardware, regardless */
972 result = saa7164_vbi_acquire_port(port); 972 result = saa7164_vbi_acquire_port(port);
973 result = saa7164_vbi_stop_port(port); 973 result = saa7164_vbi_stop_port(port);
974 if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) { 974 if (result != SAA_OK) {
975 printk(KERN_ERR "%s() run/forced stop transition " 975 printk(KERN_ERR "%s() run/forced stop transition "
976 "failed, res = 0x%x\n", __func__, result); 976 "failed, res = 0x%x\n", __func__, result);
977 } 977 }
diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h
index 742b34103b5d..8d120e3baf70 100644
--- a/drivers/media/video/saa7164/saa7164.h
+++ b/drivers/media/video/saa7164/saa7164.h
@@ -611,11 +611,6 @@ extern unsigned int saa_debug;
611 printk(KERN_WARNING "%s: " fmt, dev->name, ## arg);\ 611 printk(KERN_WARNING "%s: " fmt, dev->name, ## arg);\
612 } while (0) 612 } while (0)
613 613
614#define log_err(fmt, arg...)\
615 do { \
616 printk(KERN_ERROR "%s: " fmt, dev->name, ## arg);\
617 } while (0)
618
619#define saa7164_readl(reg) readl(dev->lmmio + ((reg) >> 2)) 614#define saa7164_readl(reg) readl(dev->lmmio + ((reg) >> 2))
620#define saa7164_writel(reg, value) writel((value), dev->lmmio + ((reg) >> 2)) 615#define saa7164_writel(reg, value) writel((value), dev->lmmio + ((reg) >> 2))
621 616