From patchwork Tue Aug 14 18:40:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 1323031 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 29854DF266 for ; Tue, 14 Aug 2012 18:41:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757308Ab2HNSlO (ORCPT ); Tue, 14 Aug 2012 14:41:14 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:40014 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757066Ab2HNSlM (ORCPT ); Tue, 14 Aug 2012 14:41:12 -0400 Received: by lbbgj3 with SMTP id gj3so416226lbb.19 for ; Tue, 14 Aug 2012 11:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type; bh=fR94QgisSHAHt0kfIlB8sf5MfTWvLPSaLymTL8gSwxo=; b=BiWxNeN0CJKkA6iZ2cGrHYMEHciGiL8LCOwj6pTQikjOaSgI5D+P6fGWNRJ1AGB4wD HNM6BZKwgK/JmrUFWHnF7AzsBE7TpnogIx0KHEaWVdL+u6tt3r2WoJWLe9xUIyV7Ps5t xpYtTHUDqKkiS2UjLJ6BX8lQ5ZeDd1vA5/LQHMR6oFwmgIpmlMOVEXCpbgP+mnDy7dPk 3/WUx9haRhKZa3LQOGFUEpFnJxCBMqWtIynfh0kTbvWXbnLrHbEYhKu+KEVvoB5QVU/q GR9FtgR0fJXstdFqT3YG2MhdO2CyCh7f9rUc73MEaFrwsCjZSa7mS04PHQf9vnnTBeTE m8JQ== Received: by 10.112.43.135 with SMTP id w7mr8516242lbl.48.1344969670191; Tue, 14 Aug 2012 11:41:10 -0700 (PDT) Received: from localhost.localdomain (dyn3-82-128-186-179.psoas.suomi.net. [82.128.186.179]) by mx.google.com with ESMTPS id lr17sm2999613lab.12.2012.08.14.11.41.08 (version=SSLv3 cipher=OTHER); Tue, 14 Aug 2012 11:41:09 -0700 (PDT) Message-ID: <502A9BB7.8020204@iki.fi> Date: Tue, 14 Aug 2012 21:40:55 +0300 From: Antti Palosaari User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120717 Thunderbird/14.0 MIME-Version: 1.0 To: Randy Dunlap CC: Stephen Rothwell , linux-next@vger.kernel.org, LKML , linux-media Subject: Re: linux-next: Tree for Aug 14 (media/dvb/dvb-usb-v2/anysee) References: <20120814135506.b6b86e3c8cb9da1eefb7bbd6@canb.auug.org.au> <502A90EC.40201@xenotime.net> In-Reply-To: <502A90EC.40201@xenotime.net> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 08/14/2012 08:54 PM, Randy Dunlap wrote: > On 08/13/2012 08:55 PM, Stephen Rothwell wrote: > >> Hi all, >> >> Changes since 20120813: >> > > > > on x86_64: > > In file included from drivers/media/dvb/dvb-usb-v2/anysee.c:34:0: > drivers/media/dvb/dvb-usb-v2/anysee.h:51:0: warning: "debug_dump" redefined > drivers/media/dvb/dvb-usb-v2/anysee.h:47:0: note: this is the location of the previous definition Thank you Randy for the report. Attached patch fix it. Unfortunately it will not apply for current next as Mauro reorganized drivers/media/ today and this one is top of that. I will make another patch to change whole driver to use Kernel dev_* debugging and sent those linus-media. I hope those are in next quite soon. regards Antti From cbd18c187db27686f2fd14348255713defe1d90a Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Tue, 14 Aug 2012 21:23:01 +0300 Subject: [PATCH] anysee: fix compiler warning debug_dump macro was defined twice when CONFIG_DVB_USB_DEBUG was not set. Move debug_dump macro to correct place. Reported-by: Randy Dunlap Signed-off-by: Antti Palosaari --- drivers/media/usb/dvb-usb-v2/anysee.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/dvb-usb-v2/anysee.h b/drivers/media/usb/dvb-usb-v2/anysee.h index dc40dcf..834dc12 100644 --- a/drivers/media/usb/dvb-usb-v2/anysee.h +++ b/drivers/media/usb/dvb-usb-v2/anysee.h @@ -41,19 +41,18 @@ #ifdef CONFIG_DVB_USB_DEBUG #define dprintk(var, level, args...) \ do { if ((var & level)) printk(args); } while (0) -#define DVB_USB_DEBUG_STATUS -#else -#define dprintk(args...) -#define debug_dump(b, l, func) -#define DVB_USB_DEBUG_STATUS " (debugging is not enabled)" -#endif - #define debug_dump(b, l, func) {\ int loop_; \ for (loop_ = 0; loop_ < l; loop_++) \ func("%02x ", b[loop_]); \ func("\n");\ } +#define DVB_USB_DEBUG_STATUS +#else +#define dprintk(args...) +#define debug_dump(b, l, func) +#define DVB_USB_DEBUG_STATUS " (debugging is not enabled)" +#endif #define deb_info(args...) dprintk(dvb_usb_anysee_debug, 0x01, args) #define deb_xfer(args...) dprintk(dvb_usb_anysee_debug, 0x02, args) -- 1.7.11.2