Re: [PATCH -next] drivers:media:radio: wl128x: fix printk formatand text

From: Mauro Carvalho Chehab
Date: Tue Mar 22 2011 - 14:23:52 EST


Em 18-03-2011 13:18, Randy Dunlap escreveu:
> What happened to this driver in linux-next of 2011.0318?
> It's in linux-next of 2011.0317.
>
> Here's a patch that was prepared against linux-next of 2011.0317.
>
> ---
> From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
>
> Fix text spacing and grammar.
> Fix printk format warning:
>
> drivers/media/radio/wl128x/fmdrv_common.c:274: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
> ---
> drivers/media/radio/wl128x/fmdrv_common.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-next-20110317.orig/drivers/media/radio/wl128x/fmdrv_common.c
> +++ linux-next-20110317/drivers/media/radio/wl128x/fmdrv_common.c
> @@ -271,8 +271,8 @@ static void recv_tasklet(unsigned long a
> /* Process all packets in the RX queue */
> while ((skb = skb_dequeue(&fmdev->rx_q))) {
> if (skb->len < sizeof(struct fm_event_msg_hdr)) {
> - fmerr("skb(%p) has only %d bytes"
> - "atleast need %d bytes to decode\n", skb,
> + fmerr("skb(%p) has only %d bytes; "
> + "need at least %zd bytes to decode\n", skb,
> skb->len, sizeof(struct fm_event_msg_hdr));
> kfree_skb(skb);
> continue;

Thanks, but it got superseeded by this one:

commit c6a721201f0ab67dc86709afe7b8f0e549bcdd07
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
AuthorDate: Sun Mar 6 09:30:02 2011 -0300
Commit: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
CommitDate: Fri Mar 11 14:13:23 2011 -0300

[media] fmdrv_common.c: fix compiler warning

drivers/media/radio/wl128x/fmdrv_common.c: In function 'recv_tasklet':
drivers/media/radio/wl128x/fmdrv_common.c:274:4: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'

The result of sizeof() should be printed with %zu.

Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index 12f4c65..64454d3 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -271,8 +271,8 @@ static void recv_tasklet(unsigned long arg)
/* Process all packets in the RX queue */
while ((skb = skb_dequeue(&fmdev->rx_q))) {
if (skb->len < sizeof(struct fm_event_msg_hdr)) {
- fmerr("skb(%p) has only %d bytes"
- "atleast need %d bytes to decode\n", skb,
+ fmerr("skb(%p) has only %d bytes, "
+ "at least need %zu bytes to decode\n", skb,
skb->len, sizeof(struct fm_event_msg_hdr));
kfree_skb(skb);
continue;

Thanks,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/