From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: "Frank Schäfer" <fschaefer.oss@googlemail.com>
Cc: linux-media@vger.kernel.org
Subject: Re: [PATCH v2 16/21] em28xx: rename usb debugging module parameter and macro
Date: Sat, 22 Dec 2012 18:10:19 -0200 [thread overview]
Message-ID: <20121222181019.775f8c3f@redhat.com> (raw)
In-Reply-To: <1352398313-3698-17-git-send-email-fschaefer.oss@googlemail.com>
Em Thu, 8 Nov 2012 20:11:48 +0200
Frank Schäfer <fschaefer.oss@googlemail.com> escreveu:
> Rename module parameter isoc_debug to usb_debug and macro
> em28xx_isocdbg to em28xx_usb dbg to reflect that they are
> used for isoc and bulk USB transfers.
>
> Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
> ---
> drivers/media/usb/em28xx/em28xx-video.c | 58 +++++++++++++++----------------
> 1 Datei geändert, 28 Zeilen hinzugefügt(+), 30 Zeilen entfernt(-)
>
> diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
> index d6de1cc..f435206 100644
> --- a/drivers/media/usb/em28xx/em28xx-video.c
> +++ b/drivers/media/usb/em28xx/em28xx-video.c
> @@ -58,13 +58,13 @@
> printk(KERN_INFO "%s %s :"fmt, \
> dev->name, __func__ , ##arg); } while (0)
>
> -static unsigned int isoc_debug;
> -module_param(isoc_debug, int, 0644);
> -MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]");
> +static unsigned int usb_debug;
> +module_param(usb_debug, int, 0644);
> +MODULE_PARM_DESC(usb_debug, "enable debug messages [isoc transfers]");
NACK: usb_debug is too generic: it could refer to control URB's, stream
URB's, and other non-URB related USB debugging. Also, it can cause
some harm for the ones using it.
As the rest of this series don't depend on this one, I'll just skip it.
IMHO, the better is to either live it as-is, to avoid breaking for
someone with "isoc_debug" parameter on their /etc/modprobe.d, or to
do a "deprecate" path:
- adding a new one called "stream_debug" (or something like that);
- keep the old one for a while, printing a warning message to
point that this got removed;
- after a few kernel cycles, remove the legacy one.
Even better: simply unify all debug params into a single one, where
each bit means one type of debug, like what was done on other drivers.
>
> -#define em28xx_isocdbg(fmt, arg...) \
> +#define em28xx_usbdbg(fmt, arg...) \
> do {\
> - if (isoc_debug) { \
> + if (usb_debug) { \
> printk(KERN_INFO "%s %s :"fmt, \
> dev->name, __func__ , ##arg); \
> } \
> @@ -161,7 +161,7 @@ static inline void buffer_filled(struct em28xx *dev,
> struct em28xx_buffer *buf)
> {
> /* Advice that buffer was filled */
> - em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
> + em28xx_usbdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
> buf->vb.state = VIDEOBUF_DONE;
> buf->vb.field_count++;
> do_gettimeofday(&buf->vb.ts);
> @@ -177,7 +177,7 @@ static inline void vbi_buffer_filled(struct em28xx *dev,
> struct em28xx_buffer *buf)
> {
> /* Advice that buffer was filled */
> - em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
> + em28xx_usbdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
>
> buf->vb.state = VIDEOBUF_DONE;
> buf->vb.field_count++;
> @@ -226,9 +226,9 @@ static void em28xx_copy_video(struct em28xx *dev,
> lencopy = lencopy > remain ? remain : lencopy;
>
> if ((char *)startwrite + lencopy > (char *)outp + buf->vb.size) {
> - em28xx_isocdbg("Overflow of %zi bytes past buffer end (1)\n",
> - ((char *)startwrite + lencopy) -
> - ((char *)outp + buf->vb.size));
> + em28xx_usbdbg("Overflow of %zi bytes past buffer end (1)\n",
> + ((char *)startwrite + lencopy) -
> + ((char *)outp + buf->vb.size));
> remain = (char *)outp + buf->vb.size - (char *)startwrite;
> lencopy = remain;
> }
> @@ -251,7 +251,7 @@ static void em28xx_copy_video(struct em28xx *dev,
>
> if ((char *)startwrite + lencopy > (char *)outp +
> buf->vb.size) {
> - em28xx_isocdbg("Overflow of %zi bytes past buffer end"
> + em28xx_usbdbg("Overflow of %zi bytes past buffer end"
> "(2)\n",
> ((char *)startwrite + lencopy) -
> ((char *)outp + buf->vb.size));
> @@ -280,24 +280,24 @@ static void em28xx_copy_vbi(struct em28xx *dev,
> int bytesperline;
>
> if (dev == NULL) {
> - em28xx_isocdbg("dev is null\n");
> + em28xx_usbdbg("dev is null\n");
> return;
> }
> bytesperline = dev->vbi_width;
>
> if (dma_q == NULL) {
> - em28xx_isocdbg("dma_q is null\n");
> + em28xx_usbdbg("dma_q is null\n");
> return;
> }
> if (buf == NULL) {
> return;
> }
> if (p == NULL) {
> - em28xx_isocdbg("p is null\n");
> + em28xx_usbdbg("p is null\n");
> return;
> }
> if (outp == NULL) {
> - em28xx_isocdbg("outp is null\n");
> + em28xx_usbdbg("outp is null\n");
> return;
> }
>
> @@ -351,9 +351,9 @@ static inline void print_err_status(struct em28xx *dev,
> break;
> }
> if (packet < 0) {
> - em28xx_isocdbg("URB status %d [%s].\n", status, errmsg);
> + em28xx_usbdbg("URB status %d [%s].\n", status, errmsg);
> } else {
> - em28xx_isocdbg("URB packet %d, status %d [%s].\n",
> + em28xx_usbdbg("URB packet %d, status %d [%s].\n",
> packet, status, errmsg);
> }
> }
> @@ -368,7 +368,7 @@ static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
> char *outp;
>
> if (list_empty(&dma_q->active)) {
> - em28xx_isocdbg("No active queue to serve\n");
> + em28xx_usbdbg("No active queue to serve\n");
> dev->usb_ctl.vid_buf = NULL;
> *buf = NULL;
> return;
> @@ -396,7 +396,7 @@ static inline void vbi_get_next_buf(struct em28xx_dmaqueue *dma_q,
> char *outp;
>
> if (list_empty(&dma_q->active)) {
> - em28xx_isocdbg("No active queue to serve\n");
> + em28xx_usbdbg("No active queue to serve\n");
> dev->usb_ctl.vbi_buf = NULL;
> *buf = NULL;
> return;
> @@ -457,8 +457,7 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb)
>
> actual_length = urb->iso_frame_desc[i].actual_length;
> if (actual_length > dev->max_pkt_size) {
> - em28xx_isocdbg("packet bigger than "
> - "packet size");
> + em28xx_usbdbg("packet bigger than packet size");
> continue;
> }
>
> @@ -476,12 +475,12 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb)
> logic simpler. Impacts of those changes should be evaluated
> */
> if (p[0] == 0x33 && p[1] == 0x95 && p[2] == 0x00) {
> - em28xx_isocdbg("VBI HEADER!!!\n");
> + em28xx_usbdbg("VBI HEADER!!!\n");
> /* FIXME: Should add vbi copy */
> continue;
> }
> if (p[0] == 0x22 && p[1] == 0x5a) {
> - em28xx_isocdbg("Video frame %d, length=%i, %s\n", p[2],
> + em28xx_usbdbg("Video frame %d, length=%i, %s\n", p[2],
> len, (p[2] & 1) ? "odd" : "even");
>
> if (dev->progressive || !(p[2] & 1)) {
> @@ -507,7 +506,7 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb)
> if (p[0] != 0x88 && p[0] != 0x22) {
> /* NOTE: no intermediate data packet header
> * 88 88 88 88 when using bulk transfers */
> - em28xx_isocdbg("frame is not complete\n");
> + em28xx_usbdbg("frame is not complete\n");
> len = actual_length;
> } else {
> len = actual_length - 4;
> @@ -569,8 +568,7 @@ static inline int em28xx_urb_data_copy_vbi(struct em28xx *dev, struct urb *urb)
>
> actual_length = urb->iso_frame_desc[i].actual_length;
> if (actual_length > dev->max_pkt_size) {
> - em28xx_isocdbg("packet bigger than "
> - "packet size");
> + em28xx_usbdbg("packet bigger than packet size");
> continue;
> }
>
> @@ -590,7 +588,7 @@ static inline int em28xx_urb_data_copy_vbi(struct em28xx *dev, struct urb *urb)
> if (p[0] == 0x33 && p[1] == 0x95) {
> dev->capture_type = 0;
> dev->vbi_read = 0;
> - em28xx_isocdbg("VBI START HEADER!!!\n");
> + em28xx_usbdbg("VBI START HEADER!!!\n");
> dev->cur_field = p[2];
> p += 4;
> len = actual_length - 4;
> @@ -615,7 +613,7 @@ static inline int em28xx_urb_data_copy_vbi(struct em28xx *dev, struct urb *urb)
> if (dev->vbi_read >= vbi_size) {
> /* We've already read all the VBI data, so
> treat the rest as video */
> - em28xx_isocdbg("dev->vbi_read > vbi_size\n");
> + em28xx_usbdbg("dev->vbi_read > vbi_size\n");
> } else if ((dev->vbi_read + len) < vbi_size) {
> /* This entire frame is VBI data */
> if (dev->vbi_read == 0 &&
> @@ -687,7 +685,7 @@ static inline int em28xx_urb_data_copy_vbi(struct em28xx *dev, struct urb *urb)
> len -= 4;
> }
> if (len >= 4 && p[0] == 0x22 && p[1] == 0x5a) {
> - em28xx_isocdbg("Video frame %d, len=%i, %s\n",
> + em28xx_usbdbg("Video frame %d, len=%i, %s\n",
> p[2], len, (p[2] & 1) ?
> "odd" : "even");
> p += 4;
> @@ -837,7 +835,7 @@ static void buffer_release(struct videobuf_queue *vq,
> struct em28xx_fh *fh = vq->priv_data;
> struct em28xx *dev = (struct em28xx *)fh->dev;
>
> - em28xx_isocdbg("em28xx: called buffer_release\n");
> + em28xx_usbdbg("em28xx: called buffer_release\n");
>
> free_buffer(vq, buf);
> }
--
Cheers,
Mauro
next prev parent reply other threads:[~2012-12-22 20:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-08 18:11 [PATCH v2 00/21] em28xx: add support fur USB bulk transfers Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 01/21] em28xx: fix wrong data offset for non-interlaced mode in em28xx_copy_video Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 02/21] em28xx: clarify meaning of field 'progressive' in struct em28xx Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 03/21] em28xx: rename isoc packet number constants and parameters Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 04/21] em28xx: rename struct em28xx_usb_isoc_bufs to em28xx_usb_bufs Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 05/21] em28xx: rename struct em28xx_usb_isoc_ctl to em28xx_usb_ctl Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 06/21] em28xx: remove obsolete #define EM28XX_URB_TIMEOUT Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 07/21] em28xx: update description of em28xx_irq_callback Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 08/21] em28xx: rename function em28xx_uninit_isoc to em28xx_uninit_usb_xfer Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 09/21] em28xx: create a common function for isoc and bulk URB allocation and setup Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 10/21] em28xx: create a common function for isoc and bulk USB transfer initialization Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 11/21] em28xx: clear USB halt/stall condition in em28xx_init_usb_xfer when using bulk transfers Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 12/21] em28xx: remove double checks for urb->status == -ENOENT in urb_data_copy functions Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 13/21] em28xx: rename function em28xx_isoc_copy and extend for USB bulk transfers Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 14/21] em28xx: rename function em28xx_isoc_copy_vbi " Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 15/21] em28xx: rename function em28xx_dvb_isoc_copy " Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 16/21] em28xx: rename usb debugging module parameter and macro Frank Schäfer
2012-12-22 20:10 ` Mauro Carvalho Chehab [this message]
2012-12-23 13:34 ` Frank Schäfer
2012-12-23 13:39 ` Mauro Carvalho Chehab
2012-11-08 18:11 ` [PATCH v2 17/21] em28xx: rename some USB parameter fields in struct em28xx to clarify their role Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 18/21] em28xx: add fields for analog and DVB USB transfer type selection to struct em28xx Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 19/21] em28xx: set USB alternate settings for analog video bulk transfers properly Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 20/21] em28xx: improve USB endpoint logic, also use bulk transfers Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 21/21] em28xx: add module parameter for selection of the preferred USB transfer type Frank Schäfer
2012-11-08 19:19 ` Devin Heitmueller
2012-11-08 18:37 ` Frank Schäfer
2012-11-08 19:46 ` Devin Heitmueller
2012-11-09 16:00 ` Frank Schäfer
2012-11-09 17:08 ` Devin Heitmueller
2012-12-23 13:44 ` Mauro Carvalho Chehab
2012-12-23 14:01 ` Frank Schäfer
2012-12-23 14:12 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121222181019.775f8c3f@redhat.com \
--to=mchehab@redhat.com \
--cc=fschaefer.oss@googlemail.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.