diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-06 05:54:31 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-06 05:54:31 +0800 |
| commit | bff1dff74d7d6d1bbe6aacc9b74d3c64d3443edd (patch) | |
| tree | 3a37fed17bfca852475d416d709c0808e6d202f4 /applied/usb-phy-remove-custom-dbg-macro.patch | |
| parent | 348b7247cdbca9abadd5cb0bdddba7e2129235d9 (diff) | |
| parent | 6866d52ad99a8c2c5301c7371fce365d25b2d0be (diff) | |
| download | patches-bff1dff74d7d6d1bbe6aacc9b74d3c64d3443edd.tar.gz | |
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Diffstat (limited to 'applied/usb-phy-remove-custom-dbg-macro.patch')
| -rw-r--r-- | applied/usb-phy-remove-custom-dbg-macro.patch | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/applied/usb-phy-remove-custom-dbg-macro.patch b/applied/usb-phy-remove-custom-dbg-macro.patch new file mode 100644 index 00000000000000..603d7e91af778c --- /dev/null +++ b/applied/usb-phy-remove-custom-dbg-macro.patch @@ -0,0 +1,105 @@ +From foo@baz Fri Jun 28 11:08:22 PDT 2013 +Date: Fri, 28 Jun 2013 11:08:22 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +Cc: Felipe Balbi <balbi@ti.com> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: USB: phy: remove custom DBG macro + +Use the in-kernel pr_debug() calls instead of trying to roll your own +DBG macro. This means the dynamic debugging calls now work here, and +there is no dependency on CONFIG_USB_DEBUG for the phy code anymore. + +Cc: Felipe Balbi <balbi@ti.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + +Note, this is against 3.10-rc7, odds are it will not apply to 3.11-rc1, +I'll refresh it when that is out and apply it then. + + drivers/usb/phy/phy-fsl-usb.c | 6 +++--- + drivers/usb/phy/phy-fsm-usb.h | 11 ++--------- + drivers/usb/phy/phy-isp1301-omap.c | 6 +----- + 3 files changed, 6 insertions(+), 17 deletions(-) + +--- a/drivers/usb/phy/phy-fsl-usb.c ++++ b/drivers/usb/phy/phy-fsl-usb.c +@@ -611,7 +611,7 @@ static int fsl_otg_set_peripheral(struct + otg_dev->fsm.b_bus_req = 1; + + /* start the gadget right away if the ID pin says Mini-B */ +- DBG("ID pin=%d\n", otg_dev->fsm.id); ++ pr_debug("ID pin=%d\n", otg_dev->fsm.id); + if (otg_dev->fsm.id == 1) { + fsl_otg_start_host(&otg_dev->fsm, 0); + otg_drv_vbus(&otg_dev->fsm, 0); +@@ -684,7 +684,7 @@ static int fsl_otg_start_hnp(struct usb_ + if (otg_dev != fsl_otg_dev) + return -ENODEV; + +- DBG("start_hnp...n"); ++ pr_debug("start_hnp...\n"); + + /* clear a_bus_req to enter a_suspend state */ + otg_dev->fsm.a_bus_req = 0; +@@ -941,7 +941,7 @@ int usb_otg_start(struct platform_device + p_otg->fsm.id = 0; + } + +- DBG("initial ID pin=%d\n", p_otg->fsm.id); ++ pr_debug("initial ID pin=%d\n", p_otg->fsm.id); + + /* enable OTG ID pin interrupt */ + temp = fsl_readl(&p_otg->dr_mem_map->otgsc); +--- a/drivers/usb/phy/phy-fsm-usb.h ++++ b/drivers/usb/phy/phy-fsm-usb.h +@@ -15,18 +15,11 @@ + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#undef DEBUG + #undef VERBOSE + +-#ifdef DEBUG +-#define DBG(fmt, args...) printk(KERN_DEBUG "[%s] " fmt , \ +- __func__, ## args) +-#else +-#define DBG(fmt, args...) do {} while (0) +-#endif +- + #ifdef VERBOSE +-#define VDBG DBG ++#define VDBG(fmt, args...) pr_debug("[%s] " fmt , \ ++ __func__, ## args) + #else + #define VDBG(stuff...) do {} while (0) + #endif +--- a/drivers/usb/phy/phy-isp1301-omap.c ++++ b/drivers/usb/phy/phy-isp1301-omap.c +@@ -40,9 +40,7 @@ + + #include <mach/usb.h> + +-#ifndef DEBUG +-#undef VERBOSE +-#endif ++#undef VERBOSE + + + #define DRIVER_VERSION "24 August 2004" +@@ -387,7 +385,6 @@ static void b_idle(struct isp1301 *isp, + static void + dump_regs(struct isp1301 *isp, const char *label) + { +-#ifdef DEBUG + u8 ctrl = isp1301_get_u8(isp, ISP1301_OTG_CONTROL_1); + u8 status = isp1301_get_u8(isp, ISP1301_OTG_STATUS); + u8 src = isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE); +@@ -396,7 +393,6 @@ dump_regs(struct isp1301 *isp, const cha + omap_readl(OTG_CTRL), label, state_name(isp), + ctrl, status, src); + /* mode control and irq enables don't change much */ +-#endif + } + + /*-------------------------------------------------------------------------*/ |