From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from qw-out-2122.google.com ([74.125.92.27]:52196 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752377AbZI1SR5 (ORCPT ); Mon, 28 Sep 2009 14:17:57 -0400 Received: by qw-out-2122.google.com with SMTP id 5so1640772qwd.37 for ; Mon, 28 Sep 2009 11:18:01 -0700 (PDT) Message-ID: <4AC0FDCD.2070705@gmail.com> Date: Mon, 28 Sep 2009 15:17:49 -0300 From: Filipe Rosset Reply-To: rosset.filipe@gmail.com MIME-Version: 1.0 To: Devin Heitmueller CC: linux-media@vger.kernel.org, Douglas Schilling Landgraf Subject: Re: [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info References: <4AC0D05D.4060304@gmail.com> <829197380909280824q487c3effp64914d8430f16092@mail.gmail.com> <4AC0E21F.1000301@gmail.com> <829197380909280923r28452c44j610ffdcccf3f5d38@mail.gmail.com> <4AC0E7B0.3010409@gmail.com> <829197380909281105p53315240t40e0609b80cf1905@mail.gmail.com> In-Reply-To: <829197380909281105p53315240t40e0609b80cf1905@mail.gmail.com> Content-Type: multipart/mixed; boundary="------------060105050805020803030809" Sender: linux-media-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --------------060105050805020803030809 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Em 28-09-2009 15:05, Devin Heitmueller escreveu: > > Hi Felipe, > > Sorry, I'm not trying to be difficult, but could you please include > the SOB block in your final patch, as you did with your original > version? This is required in order for it to be merged upstream. > > Thanks, > > Devin > Hi. Thanks for your tips. Filipe --------------060105050805020803030809 Content-Type: text/plain; name="Convert_printks_to_em28xx_err_and_em28xx_info.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="Convert_printks_to_em28xx_err_and_em28xx_info.diff" em28xx: Convert printks to em28xx_err and em28xx_info From: Filipe Rosset Convert printks to em28xx_err and em28xx_info Priority: normal Signed-off-by: Filipe Rosset diff -r cbf8899e0fd4 linux/drivers/media/video/em28xx/em28xx-dvb.c --- a/linux/drivers/media/video/em28xx/em28xx-dvb.c Mon Sep 28 11:22:23 2009 -0300 +++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c Mon Sep 28 13:37:46 2009 -0300 @@ -314,22 +314,20 @@ cfg.i2c_addr = addr; if (!dev->dvb->frontend) { - printk(KERN_ERR "%s/2: dvb frontend not attached. " - "Can't attach xc3028\n", - dev->name); + em28xx_errdev("/2: dvb frontend not attached. " + "Can't attach xc3028\n"); return -EINVAL; } fe = dvb_attach(xc2028_attach, dev->dvb->frontend, &cfg); if (!fe) { - printk(KERN_ERR "%s/2: xc3028 attach failed\n", - dev->name); + em28xx_errdev("/2: xc3028 attach failed\n"); dvb_frontend_detach(dev->dvb->frontend); dev->dvb->frontend = NULL; return -EINVAL; } - printk(KERN_INFO "%s/2: xc3028 attached\n", dev->name); + em28xx_info("%s/2: xc3028 attached\n", dev->name); return 0; } @@ -464,7 +462,7 @@ dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL); if (dvb == NULL) { - printk(KERN_INFO "em28xx_dvb: memory allocation failed\n"); + em28xx_info("em28xx_dvb: memory allocation failed\n"); return -ENOMEM; } dev->dvb = dvb; @@ -570,15 +568,12 @@ } break; default: - printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card" - " isn't supported yet\n", - dev->name); + em28xx_errdev("/2: The frontend of your DVB/ATSC card" + " isn't supported yet\n"); break; } if (NULL == dvb->frontend) { - printk(KERN_ERR - "%s/2: frontend initialization failed\n", - dev->name); + em28xx_errdev("/2: frontend initialization failed\n"); result = -EINVAL; goto out_free; } @@ -592,7 +587,7 @@ goto out_free; em28xx_set_mode(dev, EM28XX_SUSPEND); - printk(KERN_INFO "Successfully loaded em28xx-dvb\n"); + em28xx_info("Successfully loaded em28xx-dvb\n"); return 0; out_free: --------------060105050805020803030809--