Skip to content

Commit eafd5bc

Browse files
Stefan Herdleropsiff
Stefan Herdler
authored and
opsiff
committed
media: av7110: coding style fixes: logging
This patch fixes the following checkpatch warnings: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'level' may be better as '(level)' to avoid precedence issues WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_bootarm', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_diseqc_send', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_fw_cmd', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_fw_query', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_fw_request', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_osd_cmd', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_send_ci_cmd', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_send_fw_cmd', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'gpioirq', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'load_dram', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'ReleaseBitmap', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'vpeirq', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'WriteText', this function's name, in a string WARNING:LOGGING_CONTINUATION: Avoid logging continuation uses where feasible WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_cont([subsystem]dev, ... then dev_cont(dev, ... then pr_cont(... to printk(KERN_CONT ... WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_dbg([subsystem]dev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ... WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_err([subsystem]dev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ... WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ... WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_warn([subsystem]dev, ... then dev_warn(dev, ... then pr_warn(... to printk(KERN_WARNING ... WARNING:PRINTK_WITHOUT_KERN_LEVEL: printk() should include KERN_<LEVEL> facility level WARNING:TRACING_LOGGING: Unnecessary ftrace-like logging - prefer using ftrace There where different logging styles in this drivers. Convert everything to the recommend pr_* macros. Log messages should mostly be unchanged by this patch. Signed-off-by: Stefan Herdler <herdler@nurfuerspam.de> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> (cherry picked from commit f6ed894) Stable-dep-of: 458ea1c ("media: av7110: fix a spectre vulnerability") Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 6981142 commit eafd5bc

8 files changed

Lines changed: 157 additions & 187 deletions

File tree

‎drivers/staging/media/av7110/av7110.c‎

Lines changed: 58 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,27 @@ static void init_av7110_av(struct av7110 *av7110)
119119
av7110->adac_type = DVB_ADAC_TI;
120120
ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
121121
if (ret < 0)
122-
printk("dvb-ttpci:cannot set internal volume to maximum:%d\n",ret);
122+
pr_err("cannot set internal volume to maximum:%d\n", ret);
123123

124124
ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetMonitorType,
125125
1, (u16)av7110->display_ar);
126126
if (ret < 0)
127-
printk("dvb-ttpci: unable to set aspect ratio\n");
127+
pr_err("unable to set aspect ratio\n");
128128
ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType,
129129
1, av7110->display_panscan);
130130
if (ret < 0)
131-
printk("dvb-ttpci: unable to set pan scan\n");
131+
pr_err("unable to set pan scan\n");
132132

133133
ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 2, wss_cfg_4_3);
134134
if (ret < 0)
135-
printk("dvb-ttpci: unable to configure 4:3 wss\n");
135+
pr_err("unable to configure 4:3 wss\n");
136136
ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 3, wss_cfg_16_9);
137137
if (ret < 0)
138-
printk("dvb-ttpci: unable to configure 16:9 wss\n");
138+
pr_err("unable to configure 16:9 wss\n");
139139

140140
ret = av7710_set_video_mode(av7110, vidmode);
141141
if (ret < 0)
142-
printk("dvb-ttpci:cannot set video mode:%d\n",ret);
142+
pr_err("cannot set video mode:%d\n", ret);
143143

144144
/* handle different card types */
145145
/* remaining inits according to card and frontend type */
@@ -148,8 +148,7 @@ static void init_av7110_av(struct av7110 *av7110)
148148
if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000a)
149149
av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 0); // SPDIF on
150150
if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {
151-
printk ("dvb-ttpci: Crystal audio DAC @ card %d detected\n",
152-
av7110->dvb_adapter.num);
151+
pr_info("Crystal audio DAC @ card %d detected\n", av7110->dvb_adapter.num);
153152
av7110->adac_type = DVB_ADAC_CRYSTAL;
154153
i2c_writereg(av7110, 0x20, 0x01, 0xd2);
155154
i2c_writereg(av7110, 0x20, 0x02, 0x49);
@@ -162,23 +161,21 @@ static void init_av7110_av(struct av7110 *av7110)
162161
} else if (av7110_init_analog_module(av7110) == 0) {
163162
/* done. */
164163
} else if (dev->pci->subsystem_vendor == 0x110a) {
165-
printk("dvb-ttpci: DVB-C w/o analog module @ card %d detected\n",
166-
av7110->dvb_adapter.num);
164+
pr_info("DVB-C w/o analog module @ card %d detected\n", av7110->dvb_adapter.num);
167165
av7110->adac_type = DVB_ADAC_NONE;
168166
} else {
169167
av7110->adac_type = adac;
170-
printk("dvb-ttpci: adac type set to %d @ card %d\n",
171-
av7110->adac_type, av7110->dvb_adapter.num);
168+
pr_info("adac type set to %d @ card %d\n", av7110->adac_type, av7110->dvb_adapter.num);
172169
}
173170

174171
if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP34x0) {
175172
// switch DVB SCART on
176173
ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0);
177174
if (ret < 0)
178-
printk("dvb-ttpci:cannot switch on SCART(Main):%d\n",ret);
175+
pr_err("cannot switch on SCART(Main):%d\n", ret);
179176
ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 1);
180177
if (ret < 0)
181-
printk("dvb-ttpci:cannot switch on SCART(AD):%d\n",ret);
178+
pr_err("cannot switch on SCART(AD):%d\n", ret);
182179
if (rgb_on &&
183180
((av7110->dev->pci->subsystem_vendor == 0x110a) ||
184181
(av7110->dev->pci->subsystem_vendor == 0x13c2)) &&
@@ -193,12 +190,12 @@ static void init_av7110_av(struct av7110 *av7110)
193190

194191
ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
195192
if (ret < 0)
196-
printk("dvb-ttpci:cannot set volume :%d\n",ret);
193+
pr_err("cannot set volume :%d\n", ret);
197194
}
198195

199196
static void recover_arm(struct av7110 *av7110)
200197
{
201-
dprintk(4, "%p\n",av7110);
198+
dprintk(4, "%p\n", av7110);
202199

203200
av7110_bootarm(av7110);
204201
msleep(100);
@@ -230,7 +227,7 @@ static int arm_thread(void *data)
230227
u16 newloops = 0;
231228
int timeout;
232229

233-
dprintk(4, "%p\n",av7110);
230+
dprintk(4, "%p\n", av7110);
234231

235232
for (;;) {
236233
timeout = wait_event_interruptible_timeout(av7110->arm_wait,
@@ -250,8 +247,7 @@ static int arm_thread(void *data)
250247
mutex_unlock(&av7110->dcomlock);
251248

252249
if (newloops == av7110->arm_loops || av7110->arm_errors > 3) {
253-
printk(KERN_ERR "dvb-ttpci: ARM crashed @ card %d\n",
254-
av7110->dvb_adapter.num);
250+
pr_err("ARM crashed @ card %d\n", av7110->dvb_adapter.num);
255251

256252
recover_arm(av7110);
257253

@@ -325,7 +321,7 @@ static inline void print_time(char *s)
325321
struct timespec64 ts;
326322

327323
ktime_get_real_ts64(&ts);
328-
printk("%s: %lld.%09ld\n", s, (s64)ts.tv_sec, ts.tv_nsec);
324+
pr_info("%s(): %lld.%09ld\n", s, (s64)ts.tv_sec, ts.tv_nsec);
329325
#endif
330326
}
331327

@@ -336,7 +332,7 @@ static inline void start_debi_dma(struct av7110 *av7110, int dir,
336332
{
337333
dprintk(8, "%c %08lx %u\n", dir == DEBI_READ ? 'R' : 'W', addr, len);
338334
if (saa7146_wait_for_debi_done(av7110->dev, 0)) {
339-
printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__);
335+
pr_err("%s(): saa7146_wait_for_debi_done timed out\n", __func__);
340336
return;
341337
}
342338

@@ -361,9 +357,8 @@ static void debiirq(struct tasklet_struct *t)
361357
dprintk(4, "type 0x%04x\n", type);
362358

363359
if (type == -1) {
364-
printk("DEBI irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n",
365-
jiffies, saa7146_read(av7110->dev, PSR),
366-
saa7146_read(av7110->dev, SSR));
360+
pr_err("DEBI irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", jiffies,
361+
saa7146_read(av7110->dev, PSR), saa7146_read(av7110->dev, SSR));
367362
goto debi_done;
368363
}
369364
av7110->debitype = -1;
@@ -424,7 +419,7 @@ static void debiirq(struct tasklet_struct *t)
424419

425420
case DATA_DEBUG_MESSAGE:
426421
((s8 *)av7110->debi_virt)[Reserved_SIZE - 1] = 0;
427-
printk("%s\n", (s8 *) av7110->debi_virt);
422+
pr_info("%s\n", (s8 *)av7110->debi_virt);
428423
xfer = RX_BUFF;
429424
break;
430425

@@ -460,12 +455,11 @@ static void gpioirq(struct tasklet_struct *t)
460455

461456
if (av7110->debitype != -1)
462457
/* we shouldn't get any irq while a debi xfer is running */
463-
printk("dvb-ttpci: GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n",
464-
jiffies, saa7146_read(av7110->dev, PSR),
465-
saa7146_read(av7110->dev, SSR));
458+
pr_err("GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", jiffies,
459+
saa7146_read(av7110->dev, PSR), saa7146_read(av7110->dev, SSR));
466460

467461
if (saa7146_wait_for_debi_done(av7110->dev, 0)) {
468-
printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__);
462+
pr_err("%s(): saa7146_wait_for_debi_done timed out\n", __func__);
469463
BUG(); /* maybe we should try resetting the debi? */
470464
}
471465

@@ -657,7 +651,7 @@ static void gpioirq(struct tasklet_struct *t)
657651
break;
658652

659653
default:
660-
printk("dvb-ttpci: gpioirq unknown type=%d len=%d\n",
654+
pr_err("%s(): unknown irq: type=%d len=%d\n", __func__,
661655
av7110->debitype, av7110->debilen);
662656
break;
663657
}
@@ -798,9 +792,8 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
798792

799793
ret = av7110_fw_request(av7110, buf, 20, &handle, 1);
800794
if (ret != 0 || handle >= 32) {
801-
printk(KERN_ERR "dvb-ttpci: %s error buf %04x %04x %04x %04x ret %d handle %04x\n",
802-
__func__, buf[0], buf[1], buf[2], buf[3],
803-
ret, handle);
795+
pr_err("%s(): error buf %04x %04x %04x %04x ret %d handle %04x\n",
796+
__func__, buf[0], buf[1], buf[2], buf[3], ret, handle);
804797
dvbdmxfilter->hw_handle = 0xffff;
805798
if (!ret)
806799
ret = -1;
@@ -828,8 +821,8 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
828821

829822
handle = dvbdmxfilter->hw_handle;
830823
if (handle >= 32) {
831-
printk("%s tried to stop invalid filter %04x, filter type = %x\n",
832-
__func__, handle, dvbdmxfilter->type);
824+
pr_err("%s(): tried to stop invalid filter %04x, filter type = %x\n",
825+
__func__, handle, dvbdmxfilter->type);
833826
return -EINVAL;
834827
}
835828

@@ -840,9 +833,8 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
840833
buf[2] = handle;
841834
ret = av7110_fw_request(av7110, buf, 3, answ, 2);
842835
if (ret != 0 || answ[1] != handle) {
843-
printk(KERN_ERR "dvb-ttpci: %s error cmd %04x %04x %04x ret %x resp %04x %04x pid %d\n",
844-
__func__, buf[0], buf[1], buf[2], ret,
845-
answ[0], answ[1], dvbdmxfilter->feed->pid);
836+
pr_err("%s(): error cmd %04x %04x %04x ret %x resp %04x %04x pid %d\n", __func__,
837+
buf[0], buf[1], buf[2], ret, answ[0], answ[1], dvbdmxfilter->feed->pid);
846838
if (!ret)
847839
ret = -1;
848840
}
@@ -1117,11 +1109,10 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
11171109

11181110
ret = av7110_fw_request(av7110, &tag, 0, fwstc, 4);
11191111
if (ret) {
1120-
printk(KERN_ERR "%s: av7110_fw_request error\n", __func__);
1112+
pr_err("%s(): av7110_fw_request error\n", __func__);
11211113
return ret;
11221114
}
1123-
dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n",
1124-
fwstc[0], fwstc[1], fwstc[2], fwstc[3]);
1115+
dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n", fwstc[0], fwstc[1], fwstc[2], fwstc[3]);
11251116

11261117
*stc = (((uint64_t)((fwstc[3] & 0x8000) >> 15)) << 32) |
11271118
(((uint64_t)fwstc[1]) << 16) | ((uint64_t)fwstc[0]);
@@ -1250,11 +1241,10 @@ static void vpeirq(struct tasklet_struct *t)
12501241
dma_sync_sg_for_cpu(&budget->dev->pci->dev, budget->pt.slist,
12511242
budget->pt.nents, DMA_FROM_DEVICE);
12521243

1253-
#if 0
1244+
#ifdef RPS_DEBUG
12541245
/* track rps1 activity */
1255-
printk("vpeirq: %02x Event Counter 1 0x%04x\n",
1256-
mem[olddma],
1257-
saa7146_read(budget->dev, EC1R) & 0x3fff);
1246+
pr_info("%s(): %02x Event Counter 1 0x%04x\n", __func__, mem[olddma],
1247+
saa7146_read(budget->dev, EC1R) & 0x3fff);
12581248
#endif
12591249

12601250
if (newdma > olddma) {
@@ -1355,7 +1345,7 @@ static int av7110_register(struct av7110 *av7110)
13551345
dvb_dmxdev_init(&av7110->dmxdev1, &av7110->dvb_adapter);
13561346

13571347
dvb_net_init(&av7110->dvb_adapter, &av7110->dvb_net1, &dvbdemux1->dmx);
1358-
printk("dvb-ttpci: additional demux1 for budget-patch registered\n");
1348+
pr_info("additional demux1 for budget-patch registered\n");
13591349
}
13601350
return 0;
13611351
}
@@ -1444,7 +1434,7 @@ static int check_firmware(struct av7110 *av7110)
14441434
ptr = av7110->bin_fw;
14451435
if (ptr[0] != 'A' || ptr[1] != 'V' ||
14461436
ptr[2] != 'F' || ptr[3] != 'W') {
1447-
printk("dvb-ttpci: this is not an av7110 firmware\n");
1437+
pr_err("this is not an av7110 firmware\n");
14481438
return -EINVAL;
14491439
}
14501440
ptr += 4;
@@ -1455,11 +1445,11 @@ static int check_firmware(struct av7110 *av7110)
14551445
len = get_unaligned_be32(ptr);
14561446
ptr += 4;
14571447
if (len >= 512) {
1458-
printk("dvb-ttpci: dpram file is way too big.\n");
1448+
pr_err("dpram file is way too big.\n");
14591449
return -EINVAL;
14601450
}
14611451
if (crc != crc32_le(0, ptr, len)) {
1462-
printk("dvb-ttpci: crc32 of dpram file does not match.\n");
1452+
pr_err("crc32 of dpram file does not match.\n");
14631453
return -EINVAL;
14641454
}
14651455
av7110->bin_dpram = ptr;
@@ -1474,11 +1464,11 @@ static int check_firmware(struct av7110 *av7110)
14741464

14751465
if (len <= 200000 || len >= 300000 ||
14761466
len > ((av7110->bin_fw + av7110->size_fw) - ptr)) {
1477-
printk("dvb-ttpci: root file has strange size (%d). aborting.\n", len);
1467+
pr_err("root file has strange size (%d). aborting.\n", len);
14781468
return -EINVAL;
14791469
}
14801470
if (crc != crc32_le(0, ptr, len)) {
1481-
printk("dvb-ttpci: crc32 of root file does not match.\n");
1471+
pr_err("crc32 of root file does not match.\n");
14821472
return -EINVAL;
14831473
}
14841474
av7110->bin_root = ptr;
@@ -1500,18 +1490,17 @@ static int get_firmware(struct av7110 *av7110)
15001490
ret = request_firmware(&fw, "dvb-ttpci-01.fw", &av7110->dev->pci->dev);
15011491
if (ret) {
15021492
if (ret == -ENOENT) {
1503-
printk(KERN_ERR "dvb-ttpci: could not load firmware, file not found: dvb-ttpci-01.fw\n");
1504-
printk(KERN_ERR "dvb-ttpci: usually this should be in /usr/lib/hotplug/firmware or /lib/firmware\n");
1505-
printk(KERN_ERR "dvb-ttpci: and can be downloaded from https://linuxtv.org/download/dvb/firmware/\n");
1493+
pr_err("could not load firmware, file not found: dvb-ttpci-01.fw\n");
1494+
pr_err("usually this should be in /usr/lib/hotplug/firmware or /lib/firmware\n");
1495+
pr_err("and can be downloaded from https://linuxtv.org/download/dvb/firmware/\n");
15061496
} else {
1507-
printk(KERN_ERR "dvb-ttpci: cannot request firmware (error %i)\n",
1508-
ret);
1497+
pr_err("cannot request firmware (error %i)\n", ret);
15091498
}
15101499
return -EINVAL;
15111500
}
15121501

15131502
if (fw->size <= 200000) {
1514-
printk("dvb-ttpci: this firmware is way too small.\n");
1503+
pr_err("this firmware is way too small.\n");
15151504
release_firmware(fw);
15161505
return -EINVAL;
15171506
}
@@ -1827,7 +1816,7 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe)
18271816
if (fe->ops.i2c_gate_ctrl)
18281817
fe->ops.i2c_gate_ctrl(fe, 1);
18291818
if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) {
1830-
printk("nexusca: pll transfer failed!\n");
1819+
pr_err("nexusca: pll transfer failed!\n");
18311820
return -EIO;
18321821
}
18331822

@@ -2234,7 +2223,7 @@ static int frontend_init(struct av7110 *av7110)
22342223
av7110->fe->tuner_priv = &av7110->i2c_adap;
22352224

22362225
if (!dvb_attach(lnbp21_attach, av7110->fe, &av7110->i2c_adap, 0, 0)) {
2237-
printk("dvb-ttpci: LNBP21 not found!\n");
2226+
pr_err("LNBP21 not found!\n");
22382227
if (av7110->fe->ops.release)
22392228
av7110->fe->ops.release(av7110->fe);
22402229
av7110->fe = NULL;
@@ -2250,11 +2239,9 @@ static int frontend_init(struct av7110 *av7110)
22502239
if (!av7110->fe) {
22512240
/* FIXME: propagate the failure code from the lower layers */
22522241
ret = -ENOMEM;
2253-
printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
2254-
av7110->dev->pci->vendor,
2255-
av7110->dev->pci->device,
2256-
av7110->dev->pci->subsystem_vendor,
2257-
av7110->dev->pci->subsystem_device);
2242+
pr_err("A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
2243+
av7110->dev->pci->vendor, av7110->dev->pci->device,
2244+
av7110->dev->pci->subsystem_vendor, av7110->dev->pci->subsystem_device);
22582245
} else {
22592246
FE_FUNC_OVERRIDE(av7110->fe->ops.init, av7110->fe_init, av7110_fe_init);
22602247
FE_FUNC_OVERRIDE(av7110->fe->ops.read_status, av7110->fe_read_status, av7110_fe_read_status);
@@ -2268,7 +2255,7 @@ static int frontend_init(struct av7110 *av7110)
22682255

22692256
ret = dvb_register_frontend(&av7110->dvb_adapter, av7110->fe);
22702257
if (ret < 0) {
2271-
printk("av7110: Frontend registration failed!\n");
2258+
pr_err("av7110: Frontend registration failed!\n");
22722259
dvb_frontend_detach(av7110->fe);
22732260
av7110->fe = NULL;
22742261
}
@@ -2427,12 +2414,12 @@ static int av7110_attach(struct saa7146_dev *dev,
24272414
*/
24282415
if ((saa7146_read(dev, GPIO_CTRL) & 0x10000000) == 0) {
24292416
budgetpatch = 1;
2430-
printk("dvb-ttpci: BUDGET-PATCH DETECTED.\n");
2417+
pr_info("BUDGET-PATCH DETECTED.\n");
24312418
}
24322419
/* Disable RPS1 */
24332420
saa7146_write(dev, MC1, (MASK_29));
24342421
#if RPS_IRQ
2435-
printk("dvb-ttpci: Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff );
2422+
pr_info("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff);
24362423
#endif
24372424
}
24382425

@@ -2487,7 +2474,7 @@ static int av7110_attach(struct saa7146_dev *dev,
24872474
}
24882475

24892476
if (av7110->full_ts) {
2490-
printk(KERN_INFO "dvb-ttpci: full-ts mode enabled for saa7146 port B\n");
2477+
pr_info("full-ts mode enabled for saa7146 port B\n");
24912478
spin_lock_init(&av7110->feedlock1);
24922479
av7110->grabbing = saa7146_vmalloc_build_pgtable(pdev, length,
24932480
&av7110->pt);
@@ -2663,9 +2650,8 @@ static int av7110_attach(struct saa7146_dev *dev,
26632650
goto err_stop_arm_9;
26642651

26652652
if (FW_VERSION(av7110->arm_app) < 0x2501)
2666-
printk(KERN_WARNING
2667-
"dvb-ttpci: Warning, firmware version 0x%04x is too old. System might be unstable!\n",
2668-
FW_VERSION(av7110->arm_app));
2653+
pr_warn("Warning, firmware version 0x%04x is too old. System might be unstable!\n",
2654+
FW_VERSION(av7110->arm_app));
26692655

26702656
thread = kthread_run(arm_thread, (void *)av7110, "arm_mon");
26712657
if (IS_ERR(thread)) {
@@ -2702,7 +2688,7 @@ static int av7110_attach(struct saa7146_dev *dev,
27022688
#if IS_ENABLED(CONFIG_DVB_AV7110_IR)
27032689
av7110_ir_init(av7110);
27042690
#endif
2705-
printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num);
2691+
pr_info("found av7110-%d.\n", av7110_num);
27062692
av7110_num++;
27072693
out:
27082694
return ret;

0 commit comments

Comments
 (0)