[PATCH] staging: media: as102: replace custom dprintk() with dev_dbg()
don't reinvent dev_dbg(). use the common kernel coding style.
Signed-off-by: Martin Kepplinger mart...@posteo.de
---
this applies to next-20140516.
drivers/staging/media/as102/as102_drv.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/as102/as102_drv.c
b/drivers/staging/media/as102/as102_drv.c
index 09d64cd..99c3ed93 100644
--- a/drivers/staging/media/as102/as102_drv.c
+++ b/drivers/staging/media/as102/as102_drv.c
@@ -74,7 +74,8 @@ static void as102_stop_stream(struct as102_dev_t *dev)
return;
if (as10x_cmd_stop_streaming(bus_adap) 0)
- dprintk(debug, as10x_cmd_stop_streaming failed\n);
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ as10x_cmd_stop_streaming failed\n);
mutex_unlock(dev-bus_adap.lock);
}
@@ -112,14 +113,16 @@ static int as10x_pid_filter(struct as102_dev_t *dev,
int ret = -EFAULT;
if (mutex_lock_interruptible(dev-bus_adap.lock)) {
- dprintk(debug, mutex_lock_interruptible(lock) failed !\n);
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ amutex_lock_interruptible(lock) failed !\n);
return -EBUSY;
}
switch (onoff) {
case 0:
ret = as10x_cmd_del_PID_filter(bus_adap, (uint16_t) pid);
- dprintk(debug, DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n,
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n,
index, pid, ret);
break;
case 1:
@@ -131,7 +134,7 @@ static int as10x_pid_filter(struct as102_dev_t *dev,
filter.pid = pid;
ret = as10x_cmd_add_PID_filter(bus_adap, filter);
- dprintk(debug,
+ dev_dbg(dev-bus_adap.usb_dev-dev,
ADD_PID_FILTER([%02d - %02d], 0x%04x) ret = %d\n,
index, filter.idx, filter.pid, ret);
break;
--
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] staging: media: as102: replace custom dprintk() with dev_dbg()
you forget to remove debug parameter itself.
Antti
On 05/17/2014 04:16 PM, Martin Kepplinger wrote:
don't reinvent dev_dbg(). use the common kernel coding style.
Signed-off-by: Martin Kepplinger mart...@posteo.de
---
this applies to next-20140516.
drivers/staging/media/as102/as102_drv.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/as102/as102_drv.c
b/drivers/staging/media/as102/as102_drv.c
index 09d64cd..99c3ed93 100644
--- a/drivers/staging/media/as102/as102_drv.c
+++ b/drivers/staging/media/as102/as102_drv.c
@@ -74,7 +74,8 @@ static void as102_stop_stream(struct as102_dev_t *dev)
return;
if (as10x_cmd_stop_streaming(bus_adap) 0)
- dprintk(debug, as10x_cmd_stop_streaming failed\n);
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ as10x_cmd_stop_streaming failed\n);
mutex_unlock(dev-bus_adap.lock);
}
@@ -112,14 +113,16 @@ static int as10x_pid_filter(struct as102_dev_t *dev,
int ret = -EFAULT;
if (mutex_lock_interruptible(dev-bus_adap.lock)) {
- dprintk(debug, mutex_lock_interruptible(lock) failed !\n);
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ amutex_lock_interruptible(lock) failed !\n);
return -EBUSY;
}
switch (onoff) {
case 0:
ret = as10x_cmd_del_PID_filter(bus_adap, (uint16_t) pid);
- dprintk(debug, DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n,
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n,
index, pid, ret);
break;
case 1:
@@ -131,7 +134,7 @@ static int as10x_pid_filter(struct as102_dev_t *dev,
filter.pid = pid;
ret = as10x_cmd_add_PID_filter(bus_adap, filter);
- dprintk(debug,
+ dev_dbg(dev-bus_adap.usb_dev-dev,
ADD_PID_FILTER([%02d - %02d], 0x%04x) ret = %d\n,
index, filter.idx, filter.pid, ret);
break;
--
http://palosaari.fi/
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCHv2] staging: media: as102: replace custom dprintk() with dev_dbg()
don't reinvent dev_dbg(). remove dprintk() in as102_drv.c.
use the common kernel coding style.
Signed-off-by: Martin Kepplinger mart...@posteo.de
---
this applies to next-20140516. any more suggestions?
more cleanup can be done when dprintk() is completely gone.
drivers/staging/media/as102/as102_drv.c | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/media/as102/as102_drv.c
b/drivers/staging/media/as102/as102_drv.c
index 09d64cd..e0ee618 100644
--- a/drivers/staging/media/as102/as102_drv.c
+++ b/drivers/staging/media/as102/as102_drv.c
@@ -31,10 +31,6 @@
#include as102_fw.h
#include dvbdev.h
-int as102_debug;
-module_param_named(debug, as102_debug, int, 0644);
-MODULE_PARM_DESC(debug, Turn on/off debugging (default: off));
-
int dual_tuner;
module_param_named(dual_tuner, dual_tuner, int, 0644);
MODULE_PARM_DESC(dual_tuner, Activate Dual-Tuner config (default: off));
@@ -74,7 +70,8 @@ static void as102_stop_stream(struct as102_dev_t *dev)
return;
if (as10x_cmd_stop_streaming(bus_adap) 0)
- dprintk(debug, as10x_cmd_stop_streaming failed\n);
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ as10x_cmd_stop_streaming failed\n);
mutex_unlock(dev-bus_adap.lock);
}
@@ -112,14 +109,16 @@ static int as10x_pid_filter(struct as102_dev_t *dev,
int ret = -EFAULT;
if (mutex_lock_interruptible(dev-bus_adap.lock)) {
- dprintk(debug, mutex_lock_interruptible(lock) failed !\n);
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ amutex_lock_interruptible(lock) failed !\n);
return -EBUSY;
}
switch (onoff) {
case 0:
ret = as10x_cmd_del_PID_filter(bus_adap, (uint16_t) pid);
- dprintk(debug, DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n,
+ dev_dbg(dev-bus_adap.usb_dev-dev,
+ DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n,
index, pid, ret);
break;
case 1:
@@ -131,7 +130,7 @@ static int as10x_pid_filter(struct as102_dev_t *dev,
filter.pid = pid;
ret = as10x_cmd_add_PID_filter(bus_adap, filter);
- dprintk(debug,
+ dev_dbg(dev-bus_adap.usb_dev-dev,
ADD_PID_FILTER([%02d - %02d], 0x%04x) ret = %d\n,
index, filter.idx, filter.pid, ret);
break;
--
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Bug#746404: dtv-scan-tables: /usr/share/dvb/dvb-t/fr-all file : invalid enum and no DVB-T services found
Hello Olliver, attached is the output of w_scan -v -M, all the available services are well found. I've searched the web for information about DVB-T settings in France. The governement websites only provide the frequencies (the fr-All file contains all the correct frequencies for the whole country). Unfortunately no information about FEC and guard interval are publicly available. Some people provide information about the parameters of the services they receive, but it's local (for instance Paris area) or not precise (for instance: Code Rate: Unknown (0x05)). I did more tests with scan in my area (Rennes, Brittany) changing only FEC and Guard Interval parameters (QAM64) : FEC=1/2 GI=1/8 : 0 services, WARNING: filter timeout FEC=1/2 GI=1/32 : 0 services, WARNING: tuning failed FEC=2/3 GI=1/8 : 0 services, WARNING: filter timeout FEC=2/3 GI=1/32 : 0 services, WARNING: tuning failed FEC=3/4 GI=1/8 : all services found FEC=3/4 GI=1/32 : 0 services, WARNING: tuning failed FEC=AUTO GI=AUTO : all services found FEC=2/3 GI=AUTO : all services found FEC=3/4 GI=AUTO : all services found FEC=AUTO GI=1/8 : all services found FEC=AUTO GI=1/32 : all services found It seems my frontend doesn't care about a parameter when the other is set to AUTO. That is, when FEC_AUTO is selected it doesn't care about guard interval. When GUARD_INTERVAL_AUTO is selected it doesn't car about FEC. However, what I read is that some hardware doesn't support AUTO settings. Best regards, Fred On 14/05/2014 21:14, fredbob...@free.fr wrote: Hello Olliver, thank you for your reply, I will try wscan as soon as I can. I will also chase for as much information about DVB-T providers as I can. I'll keep you updated, cheers, Fred - Original Message - From: Olliver Schinagloli...@schinagl.nl To:fredbob...@free.fr Cc: Jonathan McCrohanjmccro...@gmail.com,linux-media@vger.kernel.org,746...@bugs.debian.org Sent: Wednesday, May 14, 2014 8:45:45 PM Subject: Re: Bug#746404: dtv-scan-tables: /usr/share/dvb/dvb-t/fr-all file : invalid enum and no DVB-T services found Hey Fred, On 05/14/2014 06:50 PM,fredbob...@free.fr wrote: Thank you guys for your support ! Olliver, thank you for your commit I tested it and the parsing 1) is now good. However problem 2) is still there : no services are found at the end of the scan. I mean when doing : scan dtv-scan-tables/dvb-t/fr-All the end result is : ERROR: initial tuning failed dumping lists (0 services) Done. Digging further I think the problem is due to FEC, QAM and Guard Interval parameters consistency. Indeed in France it seems there are 2 schemes for DVB-T services depending on where you live (I'm not quite 100% sure as I could only find very few official reliable information) : FEC 3/4, QAM64, Guard Interval 1/8 FEC 2/3, QAM16, Guard Interval 1/32 Whereas in the file we have : FEC 2/3, QAM64, Guard Interval 1/32 Have you tried wscan? wscan is able to generate a 'initial scanning file' which should result in a proper file. See, the thing is, I don't know what is right and what is from for the entirety of France, I don't have the range nor the lingustic skill to read the dvb-t sites from French providers about the proper parameters. We are kind of Dependant on people who live in an area to submit the proper scan files. If you think or know that identical frequencies are used with different parameters in different regions, then that is something that needs to be explored. If the auto setting works well, we could use that. But try to do a wscan and generate an initial scan file from it and see what it says, I'd be very curious indeed. Olliver However I think this scheme may be OK depending on your HW frontend tolerance. Unfortunately it doesn't work with my Hauppauge NOVA-TD-500. I propose 2 options : A) rely on the the AUTO capability and use FEC AUTO, QAM AUTO, GI AUTO in the frequency file (please refer to attached file fr-All-optionA) B) double the file with both schemes for each frequency (please refer to attached file fr-All-optionB) : the drawback is that the scan is twice longer. I sucessfully managed to scan services with both A B. I've attached both tests outputs for your reference. = But I only have TV channels with the first scheme in my area. Do you have an opinion about A or B ? Thank you. Cheers, Fred - Original Message - From: Olliver Schinagloli...@schinagl.nl Cc: fredbobossfredbob...@free.fr Sent: Monday, May 12, 2014 11:16:18 PM Subject: Re: Fwd: Bug#746404: dtv-scan-tables: /usr/share/dvb/dvb-t/fr-all file : invalid enum and no DVB-T services found Apologies to all involved, I overlooked this e-mail. I patched it to fix the casing as suggested in the e-mail and pushed it upstream. Can you please test it? Olliver On 04/29/2014 11:57 PM, Jonathan McCrohan wrote: Hi Oliver, Please find Debian bug report from fredboboss regarding dtv-scan-tables below. Thanks, Jon On Tue, 29 Apr 2014 19:50:57 +0200,
Re: [PATCHv2] staging: media: as102: replace custom dprintk() with dev_dbg()
On 05/17/2014 07:05 PM, Martin Kepplinger wrote: don't reinvent dev_dbg(). remove dprintk() in as102_drv.c. use the common kernel coding style. Signed-off-by: Martin Kepplinger mart...@posteo.de Reviewed-by: Antti Palosaari cr...@iki.fi --- this applies to next-20140516. any more suggestions? more cleanup can be done when dprintk() is completely gone. Do you have the device? I am a bit reluctant patching that driver without any testing as it has happened too many times something has gone totally broken. IIRC Devin said it is in staging because of style issues and nothing more. Is that correct? regards Antti -- http://palosaari.fi/ -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv2] staging: media: as102: replace custom dprintk() with dev_dbg()
Am 2014-05-17 19:21, schrieb Antti Palosaari: On 05/17/2014 07:05 PM, Martin Kepplinger wrote: don't reinvent dev_dbg(). remove dprintk() in as102_drv.c. use the common kernel coding style. Signed-off-by: Martin Kepplinger mart...@posteo.de Reviewed-by: Antti Palosaari cr...@iki.fi --- this applies to next-20140516. any more suggestions? more cleanup can be done when dprintk() is completely gone. Do you have the device? I am a bit reluctant patching that driver without any testing as it has happened too many times something has gone totally broken. I don't have the device and will, at most, change such style issues. IIRC Devin said it is in staging because of style issues and nothing more. Is that correct? I haven't heard anything. A TODO file would help. regards Antti -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv2] staging: media: as102: replace custom dprintk() with dev_dbg()
Il 17/05/2014 19:52, Martin Kepplinger ha scritto: Am 2014-05-17 19:21, schrieb Antti Palosaari: On 05/17/2014 07:05 PM, Martin Kepplinger wrote: don't reinvent dev_dbg(). remove dprintk() in as102_drv.c. use the common kernel coding style. Signed-off-by: Martin Kepplinger mart...@posteo.de Reviewed-by: Antti Palosaari cr...@iki.fi --- this applies to next-20140516. any more suggestions? more cleanup can be done when dprintk() is completely gone. Do you have the device? I am a bit reluctant patching that driver without any testing as it has happened too many times something has gone totally broken. I don't have the device and will, at most, change such style issues. IIRC Devin said it is in staging because of style issues and nothing more. Is that correct? I haven't heard anything. A TODO file would help. Hi Antti, Martin, if I remember correctly, the main issue with this driver is that the device does not work anymore after a reboot: it needs a power cycle to start working again. Probably this issue is enough to keep the driver in staging. Regards, Gianluca regards Antti -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv2] staging: media: as102: replace custom dprintk() with dev_dbg()
On Sat, May 17, 2014 at 08:21:03PM +0300, Antti Palosaari wrote: On 05/17/2014 07:05 PM, Martin Kepplinger wrote: don't reinvent dev_dbg(). remove dprintk() in as102_drv.c. use the common kernel coding style. Signed-off-by: Martin Kepplinger mart...@posteo.de Reviewed-by: Antti Palosaari cr...@iki.fi --- this applies to next-20140516. any more suggestions? more cleanup can be done when dprintk() is completely gone. Do you have the device? I am a bit reluctant patching that driver without any testing as it has happened too many times something has gone totally broken. Looking through the log the only time I see breakage is build breakage on allyesconfig. 1ec9a35 [media] staging: as102: Add missing function argument This was a compile warning and it definitely should have been caught before the code was submitted or merged, but it wasn't something people would hit in real life. regards, dan carpenter -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
cron job: media_tree daily build: OK
This message is generated daily by a cron job that builds media_tree for the kernels and architectures in the list below. Results of the daily build of media_tree: date: Sun May 18 04:00:15 CEST 2014 git branch: test git hash: ba0d342ecc21fbbe2f6c178f4479944d1fb34f3b gcc version:i686-linux-gcc (GCC) 4.8.2 sparse version: v0.5.0-11-g38d1124 host hardware: x86_64 host os:3.14-1.slh.1-amd64 linux-git-arm-at91: OK linux-git-arm-davinci: OK linux-git-arm-exynos: OK linux-git-arm-mx: OK linux-git-arm-omap: OK linux-git-arm-omap1: OK linux-git-arm-pxa: OK linux-git-blackfin: OK linux-git-i686: OK linux-git-m32r: OK linux-git-mips: OK linux-git-powerpc64: OK linux-git-sh: OK linux-git-x86_64: OK linux-2.6.31.14-i686: OK linux-2.6.32.27-i686: OK linux-2.6.33.7-i686: OK linux-2.6.34.7-i686: OK linux-2.6.35.9-i686: OK linux-2.6.36.4-i686: OK linux-2.6.37.6-i686: OK linux-2.6.38.8-i686: OK linux-2.6.39.4-i686: OK linux-3.0.60-i686: OK linux-3.1.10-i686: OK linux-3.2.37-i686: OK linux-3.3.8-i686: OK linux-3.4.27-i686: OK linux-3.5.7-i686: OK linux-3.6.11-i686: OK linux-3.7.4-i686: OK linux-3.8-i686: OK linux-3.9.2-i686: OK linux-3.10.1-i686: OK linux-3.11.1-i686: OK linux-3.12-i686: OK linux-3.13-i686: OK linux-3.14-i686: OK linux-3.15-rc1-i686: OK linux-2.6.31.14-x86_64: OK linux-2.6.32.27-x86_64: OK linux-2.6.33.7-x86_64: OK linux-2.6.34.7-x86_64: OK linux-2.6.35.9-x86_64: OK linux-2.6.36.4-x86_64: OK linux-2.6.37.6-x86_64: OK linux-2.6.38.8-x86_64: OK linux-2.6.39.4-x86_64: OK linux-3.0.60-x86_64: OK linux-3.1.10-x86_64: OK linux-3.2.37-x86_64: OK linux-3.3.8-x86_64: OK linux-3.4.27-x86_64: OK linux-3.5.7-x86_64: OK linux-3.6.11-x86_64: OK linux-3.7.4-x86_64: OK linux-3.8-x86_64: OK linux-3.9.2-x86_64: OK linux-3.10.1-x86_64: OK linux-3.11.1-x86_64: OK linux-3.12-x86_64: OK linux-3.13-x86_64: OK linux-3.14-x86_64: OK linux-3.15-rc1-x86_64: OK apps: OK spec-git: OK sparse version: v0.5.0-11-g38d1124 sparse: ERRORS Detailed results are available here: http://www.xs4all.nl/~hverkuil/logs/Sunday.log Full logs are available here: http://www.xs4all.nl/~hverkuil/logs/Sunday.tar.bz2 The Media Infrastructure API from this daily build is here: http://www.xs4all.nl/~hverkuil/spec/media.html -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
