aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/tuners/max2165.c10
-rw-r--r--drivers/media/dvb/frontends/atbm8830.c8
-rw-r--r--drivers/media/dvb/frontends/lgs8gxx.c11
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-tvaudio.c12
5 files changed, 18 insertions, 25 deletions
diff --git a/drivers/media/common/tuners/max2165.c b/drivers/media/common/tuners/max2165.c
index 937e4b00d7ee..9883617b7862 100644
--- a/drivers/media/common/tuners/max2165.c
+++ b/drivers/media/common/tuners/max2165.c
@@ -52,13 +52,12 @@ static int max2165_write_reg(struct max2165_priv *priv, u8 reg, u8 data)
52 msg.addr = priv->config->i2c_address; 52 msg.addr = priv->config->i2c_address;
53 53
54 if (debug >= 2) 54 if (debug >= 2)
55 printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", 55 dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, data);
56 __func__, reg, data);
57 56
58 ret = i2c_transfer(priv->i2c, &msg, 1); 57 ret = i2c_transfer(priv->i2c, &msg, 1);
59 58
60 if (ret != 1) 59 if (ret != 1)
61 dprintk(KERN_DEBUG "%s: error reg=0x%x, data=0x%x, ret=%i\n", 60 dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
62 __func__, reg, data, ret); 61 __func__, reg, data, ret);
63 62
64 return (ret != 1) ? -EIO : 0; 63 return (ret != 1) ? -EIO : 0;
@@ -78,14 +77,13 @@ static int max2165_read_reg(struct max2165_priv *priv, u8 reg, u8 *p_data)
78 77
79 ret = i2c_transfer(priv->i2c, msg, 2); 78 ret = i2c_transfer(priv->i2c, msg, 2);
80 if (ret != 2) { 79 if (ret != 2) {
81 dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n", 80 dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret);
82 __func__, reg, ret);
83 return -EIO; 81 return -EIO;
84 } 82 }
85 83
86 *p_data = b1[0]; 84 *p_data = b1[0];
87 if (debug >= 2) 85 if (debug >= 2)
88 printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", 86 dprintk("%s: reg=0x%02X, data=0x%02X\n",
89 __func__, reg, b1[0]); 87 __func__, reg, b1[0]);
90 return 0; 88 return 0;
91} 89}
diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c
index 43aac2f85c2e..1539ea1f81ac 100644
--- a/drivers/media/dvb/frontends/atbm8830.c
+++ b/drivers/media/dvb/frontends/atbm8830.c
@@ -50,8 +50,7 @@ static int atbm8830_write_reg(struct atbm_state *priv, u16 reg, u8 data)
50 msg2.addr = dev_addr; 50 msg2.addr = dev_addr;
51 51
52 if (debug >= 2) 52 if (debug >= 2)
53 printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n", 53 dprintk("%s: reg=0x%04X, data=0x%02X\n", __func__, reg, data);
54 __func__, reg, data);
55 54
56 ret = i2c_transfer(priv->i2c, &msg1, 1); 55 ret = i2c_transfer(priv->i2c, &msg1, 1);
57 if (ret != 1) 56 if (ret != 1)
@@ -77,8 +76,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data)
77 76
78 ret = i2c_transfer(priv->i2c, &msg1, 1); 77 ret = i2c_transfer(priv->i2c, &msg1, 1);
79 if (ret != 1) { 78 if (ret != 1) {
80 dprintk(KERN_DEBUG "%s: error reg=0x%04x, ret=%i\n", 79 dprintk("%s: error reg=0x%04x, ret=%i\n", __func__, reg, ret);
81 __func__, reg, ret);
82 return -EIO; 80 return -EIO;
83 } 81 }
84 82
@@ -88,7 +86,7 @@ static int atbm8830_read_reg(struct atbm_state *priv, u16 reg, u8 *p_data)
88 86
89 *p_data = buf2[0]; 87 *p_data = buf2[0];
90 if (debug >= 2) 88 if (debug >= 2)
91 printk(KERN_DEBUG "%s: reg=0x%04X, data=0x%02X\n", 89 dprintk("%s: reg=0x%04X, data=0x%02X\n",
92 __func__, reg, buf2[0]); 90 __func__, reg, buf2[0]);
93 91
94 return 0; 92 return 0;
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c
index 0fcddc4569d2..1172b54689f8 100644
--- a/drivers/media/dvb/frontends/lgs8gxx.c
+++ b/drivers/media/dvb/frontends/lgs8gxx.c
@@ -60,13 +60,12 @@ static int lgs8gxx_write_reg(struct lgs8gxx_state *priv, u8 reg, u8 data)
60 msg.addr += 0x02; 60 msg.addr += 0x02;
61 61
62 if (debug >= 2) 62 if (debug >= 2)
63 printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", 63 dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, data);
64 __func__, reg, data);
65 64
66 ret = i2c_transfer(priv->i2c, &msg, 1); 65 ret = i2c_transfer(priv->i2c, &msg, 1);
67 66
68 if (ret != 1) 67 if (ret != 1)
69 dprintk(KERN_DEBUG "%s: error reg=0x%x, data=0x%x, ret=%i\n", 68 dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
70 __func__, reg, data, ret); 69 __func__, reg, data, ret);
71 70
72 return (ret != 1) ? -1 : 0; 71 return (ret != 1) ? -1 : 0;
@@ -91,15 +90,13 @@ static int lgs8gxx_read_reg(struct lgs8gxx_state *priv, u8 reg, u8 *p_data)
91 90
92 ret = i2c_transfer(priv->i2c, msg, 2); 91 ret = i2c_transfer(priv->i2c, msg, 2);
93 if (ret != 2) { 92 if (ret != 2) {
94 dprintk(KERN_DEBUG "%s: error reg=0x%x, ret=%i\n", 93 dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret);
95 __func__, reg, ret);
96 return -1; 94 return -1;
97 } 95 }
98 96
99 *p_data = b1[0]; 97 *p_data = b1[0];
100 if (debug >= 2) 98 if (debug >= 2)
101 printk(KERN_DEBUG "%s: reg=0x%02X, data=0x%02X\n", 99 dprintk("%s: reg=0x%02X, data=0x%02X\n", __func__, reg, b1[0]);
102 __func__, reg, b1[0]);
103 return 0; 100 return 0;
104} 101}
105 102
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 46d31dfca7a3..b6c682f0acec 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -972,7 +972,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
972 an existing device. Weird... 972 an existing device. Weird...
973 REVISIT: might no longer be needed */ 973 REVISIT: might no longer be needed */
974 rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1); 974 rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
975 dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n", 975 dprintk("probe 0x%02x @ %s: %s\n",
976 msg_msi.addr, dev->i2c_adap.name, 976 msg_msi.addr, dev->i2c_adap.name,
977 (1 == rc) ? "yes" : "no"); 977 (1 == rc) ? "yes" : "no");
978 break; 978 break;
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 3e7d2fd1688f..57e646bb48b3 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -550,16 +550,16 @@ static int tvaudio_thread(void *data)
550 } else if (0 != dev->last_carrier) { 550 } else if (0 != dev->last_carrier) {
551 /* no carrier -- try last detected one as fallback */ 551 /* no carrier -- try last detected one as fallback */
552 carrier = dev->last_carrier; 552 carrier = dev->last_carrier;
553 dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, " 553 dprintk("audio carrier scan failed, "
554 "using %d.%03d MHz [last detected]\n", 554 "using %d.%03d MHz [last detected]\n",
555 dev->name, carrier/1000, carrier%1000); 555 carrier/1000, carrier%1000);
556 556
557 } else { 557 } else {
558 /* no carrier + no fallback -- use default */ 558 /* no carrier + no fallback -- use default */
559 carrier = default_carrier; 559 carrier = default_carrier;
560 dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, " 560 dprintk("audio carrier scan failed, "
561 "using %d.%03d MHz [default]\n", 561 "using %d.%03d MHz [default]\n",
562 dev->name, carrier/1000, carrier%1000); 562 carrier/1000, carrier%1000);
563 } 563 }
564 tvaudio_setcarrier(dev,carrier,carrier); 564 tvaudio_setcarrier(dev,carrier,carrier);
565 dev->automute = 0; 565 dev->automute = 0;
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-07 21:27:12 -0500