From: Roger Quadros <rogerq@ti.com> To: <gregkh@linuxfoundation.org>, <balbi@ti.com>, <stern@rowland.harvard.edu> Cc: <dan.j.williams@intel.com>, <peter.chen@freescale.com>, <jun.li@freescale.com>, <mathias.nyman@linux.intel.com>, <tony@atomide.com>, <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>, Roger Quadros <rogerq@ti.com> Subject: [RFC][PATCH v2 03/13] usb: otg-fsm: Prevent build warning "VDBG" redefined Date: Tue, 14 Apr 2015 13:41:50 +0300 [thread overview] Message-ID: <1429008120-5395-4-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1429008120-5395-1-git-send-email-rogerq@ti.com> If usb/otg-fsm.h and usb/composite.h are included together then it results in the build warning [1]. Prevent that by moving the VDBG defination into the usb-otg-fsm.c file where it is used. Also get rid of MPC_LOC which doesn't seem to be used by anyone. [1] - warning fixed by this patch: In file included from drivers/usb/dwc3/core.h:33, from drivers/usb/dwc3/ep0.c:33: include/linux/usb/otg-fsm.h:30:1: warning: "VDBG" redefined In file included from drivers/usb/dwc3/ep0.c:31: include/linux/usb/composite.h:615:1: warning: this is the location of the previous definition Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/common/usb-otg-fsm.c | 9 +++++++++ include/linux/usb/otg-fsm.h | 15 --------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c index 0caa37b..35f311a 100644 --- a/drivers/usb/common/usb-otg-fsm.c +++ b/drivers/usb/common/usb-otg-fsm.c @@ -30,6 +30,15 @@ #include <linux/usb/otg.h> #include <linux/usb/otg-fsm.h> +#undef VDBG + +#ifdef VERBOSE +#define VDBG(fmt, args...) pr_debug("[%s] " fmt , \ + __func__, ## args) +#else +#define VDBG(stuff...) do {} while (0) +#endif + /* Change USB protocol when there is a protocol change */ static int otg_set_protocol(struct otg_fsm *fsm, int protocol) { diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h index 85a9150..73136aa 100644 --- a/include/linux/usb/otg-fsm.h +++ b/include/linux/usb/otg-fsm.h @@ -21,21 +21,6 @@ #include <linux/mutex.h> #include <linux/errno.h> -#undef VERBOSE - -#ifdef VERBOSE -#define VDBG(fmt, args...) pr_debug("[%s] " fmt , \ - __func__, ## args) -#else -#define VDBG(stuff...) do {} while (0) -#endif - -#ifdef VERBOSE -#define MPC_LOC printk("Current Location [%s]:[%d]\n", __FILE__, __LINE__) -#else -#define MPC_LOC do {} while (0) -#endif - #define PROTO_UNDEF (0) #define PROTO_HOST (1) #define PROTO_GADGET (2) -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com> To: gregkh@linuxfoundation.org, balbi@ti.com, stern@rowland.harvard.edu Cc: dan.j.williams@intel.com, peter.chen@freescale.com, jun.li@freescale.com, mathias.nyman@linux.intel.com, tony@atomide.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Roger Quadros <rogerq@ti.com> Subject: [RFC][PATCH v2 03/13] usb: otg-fsm: Prevent build warning "VDBG" redefined Date: Tue, 14 Apr 2015 13:41:50 +0300 [thread overview] Message-ID: <1429008120-5395-4-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1429008120-5395-1-git-send-email-rogerq@ti.com> If usb/otg-fsm.h and usb/composite.h are included together then it results in the build warning [1]. Prevent that by moving the VDBG defination into the usb-otg-fsm.c file where it is used. Also get rid of MPC_LOC which doesn't seem to be used by anyone. [1] - warning fixed by this patch: In file included from drivers/usb/dwc3/core.h:33, from drivers/usb/dwc3/ep0.c:33: include/linux/usb/otg-fsm.h:30:1: warning: "VDBG" redefined In file included from drivers/usb/dwc3/ep0.c:31: include/linux/usb/composite.h:615:1: warning: this is the location of the previous definition Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/common/usb-otg-fsm.c | 9 +++++++++ include/linux/usb/otg-fsm.h | 15 --------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c index 0caa37b..35f311a 100644 --- a/drivers/usb/common/usb-otg-fsm.c +++ b/drivers/usb/common/usb-otg-fsm.c @@ -30,6 +30,15 @@ #include <linux/usb/otg.h> #include <linux/usb/otg-fsm.h> +#undef VDBG + +#ifdef VERBOSE +#define VDBG(fmt, args...) pr_debug("[%s] " fmt , \ + __func__, ## args) +#else +#define VDBG(stuff...) do {} while (0) +#endif + /* Change USB protocol when there is a protocol change */ static int otg_set_protocol(struct otg_fsm *fsm, int protocol) { diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h index 85a9150..73136aa 100644 --- a/include/linux/usb/otg-fsm.h +++ b/include/linux/usb/otg-fsm.h @@ -21,21 +21,6 @@ #include <linux/mutex.h> #include <linux/errno.h> -#undef VERBOSE - -#ifdef VERBOSE -#define VDBG(fmt, args...) pr_debug("[%s] " fmt , \ - __func__, ## args) -#else -#define VDBG(stuff...) do {} while (0) -#endif - -#ifdef VERBOSE -#define MPC_LOC printk("Current Location [%s]:[%d]\n", __FILE__, __LINE__) -#else -#define MPC_LOC do {} while (0) -#endif - #define PROTO_UNDEF (0) #define PROTO_HOST (1) #define PROTO_GADGET (2) -- 2.1.0
next prev parent reply other threads:[~2015-04-14 10:42 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-14 10:41 [RFC][PATCH v2 00/13] USB: OTG/DRD Core functionality Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 01/13] usb: otg-fsm: Add documentation for struct otg_fsm Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-16 11:32 ` Peter Chen 2015-04-16 11:32 ` Peter Chen 2015-04-17 8:45 ` Roger Quadros 2015-04-17 8:45 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 02/13] usb: otg-fsm: support multiple instances Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-16 11:36 ` Peter Chen 2015-04-16 11:36 ` Peter Chen 2015-04-16 11:58 ` Roger Quadros 2015-04-16 11:58 ` Roger Quadros 2015-04-16 12:06 ` Peter Chen 2015-04-16 12:06 ` Peter Chen 2015-04-14 10:41 ` Roger Quadros [this message] 2015-04-14 10:41 ` [RFC][PATCH v2 03/13] usb: otg-fsm: Prevent build warning "VDBG" redefined Roger Quadros 2015-04-16 11:41 ` Peter Chen 2015-04-16 11:41 ` Peter Chen 2015-04-16 11:59 ` Roger Quadros 2015-04-16 11:59 ` Roger Quadros 2015-04-16 12:07 ` Peter Chen 2015-04-16 12:07 ` Peter Chen 2015-04-14 10:41 ` [RFC][PATCH v2 04/13] usb: gadget: add usb_gadget_start/stop() Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-16 11:48 ` Peter Chen 2015-04-16 11:48 ` Peter Chen 2015-04-16 12:07 ` Roger Quadros 2015-04-16 12:07 ` Roger Quadros 2015-04-16 12:12 ` Peter Chen 2015-04-16 12:12 ` Peter Chen 2015-04-14 10:41 ` [RFC][PATCH v2 05/13] usb: otg: add OTG core Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-15 9:29 ` Paul Bolle 2015-04-15 13:24 ` Roger Quadros 2015-04-15 13:24 ` Roger Quadros 2015-04-16 12:02 ` Peter Chen 2015-04-16 12:02 ` Peter Chen 2015-04-16 13:04 ` Roger Quadros 2015-04-16 13:04 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 06/13] usb: hcd: Add hcd add/remove functions for OTG use Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-17 2:18 ` Peter Chen 2015-04-17 2:18 ` Peter Chen 2015-04-17 7:21 ` Roger Quadros 2015-04-17 7:21 ` Roger Quadros 2015-04-17 14:03 ` Alan Stern 2015-04-17 14:03 ` Alan Stern 2015-04-20 7:00 ` Roger Quadros 2015-04-20 7:00 ` Roger Quadros 2015-04-20 13:56 ` Alan Stern 2015-04-20 13:56 ` Alan Stern 2015-04-21 7:02 ` Roger Quadros 2015-04-21 7:02 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 07/13] usb: otg: Add dual-role device (DRD) support Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 08/13] usb: otg: hub: Notify OTG fsm when A device sets b_hnp_enable Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-17 2:28 ` Peter Chen 2015-04-17 2:28 ` Peter Chen 2015-04-17 7:32 ` Roger Quadros 2015-04-17 7:32 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 09/13] usb: gadget: udc: adapt to OTG Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 10/13] udc-core: fix lock circular dependency on udc_lock Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 11/13] usb: add "dual-role" mode to dr_mode device tree helper Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-14 10:41 ` [RFC][PATCH v2 12/13] usb: dwc3: add dual-role support Roger Quadros 2015-04-14 10:41 ` Roger Quadros 2015-04-14 10:42 ` [RFC][PATCH v2 13/13] ARM: dts: dra7x-evm: Enable dual-role for usb1 Roger Quadros 2015-04-14 10:42 ` Roger Quadros 2015-04-20 3:05 ` [RFC][PATCH v2 00/13] USB: OTG/DRD Core functionality Peter Chen 2015-04-20 3:05 ` Peter Chen 2015-04-20 7:28 ` Roger Quadros 2015-04-20 7:28 ` Roger Quadros 2015-04-21 6:04 ` Peter Chen 2015-04-21 6:04 ` Peter Chen 2015-04-21 7:34 ` Roger Quadros 2015-04-22 2:17 ` Peter Chen 2015-04-22 7:33 ` Roger Quadros 2015-04-22 7:33 ` Roger Quadros 2015-04-22 9:22 ` Peter Chen 2015-04-22 12:42 ` Roger Quadros 2015-04-23 1:52 ` Peter Chen 2015-04-23 6:35 ` Roger Quadros
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=1429008120-5395-4-git-send-email-rogerq@ti.com \ --to=rogerq@ti.com \ --cc=balbi@ti.com \ --cc=dan.j.williams@intel.com \ --cc=gregkh@linuxfoundation.org \ --cc=jun.li@freescale.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=mathias.nyman@linux.intel.com \ --cc=peter.chen@freescale.com \ --cc=stern@rowland.harvard.edu \ --cc=tony@atomide.com \ /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: linkBe 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.