Re: [PATCH] ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP

2014-05-16 Thread Paul Bolle 
Felipe,

On Thu, 2014-05-15 at 18:12 -0500, Felipe Balbi wrote:
 On Thu, May 15, 2014 at 10:55:45PM +0200, Paul Bolle wrote:
  diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
  index 65d2acb31498..57092bc7f4f1 100644
  --- a/arch/arm/mach-omap1/board-h2.c
  +++ b/arch/arm/mach-omap1/board-h2.c
  @@ -346,7 +346,7 @@ static struct omap_usb_config h2_usb_config __initdata 
  = {
  /* usb1 has a Mini-AB port and external isp1301 transceiver */
  .otg= 2,
   
  -#ifdef CONFIG_USB_GADGET_OMAP
  +#ifdef CONFIG_USB_OMAP
 
 CONFIG_USB_OMAP is tristate, it might be better to use
 IS_ENABLED(CONFIG_USB_OMAP) here. Likewise for the rest of the patch.

Will do shortly. That does increase the scope of the patch, a bit, but
since this code has been effectively dead since v3.1 that is hardly an
additional risk.

Thanks!


Paul Bolle

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP

2014-05-15 Thread Felipe Balbi 
On Thu, May 15, 2014 at 10:55:45PM +0200, Paul Bolle wrote:
 Commit 193ab2a60700 (usb: gadget: allow multiple gadgets to be built)
 apparently required that checks for CONFIG_USB_GADGET_OMAP would be
 replaced with checks for CONFIG_USB_OMAP. Do so now for the remaining
 checks for CONFIG_USB_GADGET_OMAP, even though these checks have
 basically been broken since v3.1.
 
 Fixes: 193ab2a60700 (usb: gadget: allow multiple gadgets to be built)
 Signed-off-by: Paul Bolle pebo...@tiscali.nl
 ---
 Also untested.
 
 It seems efficient to also include the change to phy-isp1301-omap.c in
 this patch (ie, not ship that as a separate patch).
 
  arch/arm/mach-omap1/board-h2.c| 2 +-
  arch/arm/mach-omap1/board-h3.c| 2 +-
  arch/arm/mach-omap1/board-innovator.c | 2 +-
  arch/arm/mach-omap1/board-osk.c   | 2 +-
  drivers/usb/phy/phy-isp1301-omap.c| 2 +-
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
 index 65d2acb31498..57092bc7f4f1 100644
 --- a/arch/arm/mach-omap1/board-h2.c
 +++ b/arch/arm/mach-omap1/board-h2.c
 @@ -346,7 +346,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
   /* usb1 has a Mini-AB port and external isp1301 transceiver */
   .otg= 2,
  
 -#ifdef   CONFIG_USB_GADGET_OMAP
 +#ifdef   CONFIG_USB_OMAP

CONFIG_USB_OMAP is tristate, it might be better to use
IS_ENABLED(CONFIG_USB_OMAP) here. Likewise for the rest of the patch.

-- 
balbi


signature.asc
Description: Digital signature