Re: [PATCH 2/5] usb: extcon: Fix USB-Host cable name
On Mon, Jan 19, 2015 at 07:52:19PM +0200, Roger Quadros wrote: > The recommended name for USB-Host cable state is "USB-Host" and not > "USB-HOST" as per drivers/extcon/extcon-class.c extcon_cable_name. > > Change all instances of "USB-HOST" to "USB-Host". > > Signed-off-by: Roger Quadros I checked that these are not documented and there are no DTS using USB-HOST, so it's fine to change Reviewed-by: Felipe Balbi Acked-by: Felipe Balbi > --- > drivers/extcon/extcon-palmas.c | 18 +- > drivers/usb/dwc3/dwc3-omap.c | 6 +++--- > drivers/usb/phy/phy-omap-otg.c | 4 ++-- > drivers/usb/phy/phy-tahvo.c| 8 > 4 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c > index 11c6757..6d002c3 100644 > --- a/drivers/extcon/extcon-palmas.c > +++ b/drivers/extcon/extcon-palmas.c > @@ -31,7 +31,7 @@ > > static const char *palmas_extcon_cable[] = { > [0] = "USB", > - [1] = "USB-HOST", > + [1] = "USB-Host", > NULL, > }; > > @@ -93,26 +93,26 @@ static irqreturn_t palmas_id_irq_handler(int irq, void > *_palmas_usb) > PALMAS_USB_ID_INT_LATCH_CLR, > PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND); > palmas_usb->linkstat = PALMAS_USB_STATE_ID; > - extcon_set_cable_state(palmas_usb->edev, "USB-HOST", true); > - dev_info(palmas_usb->dev, "USB-HOST cable is attached\n"); > + extcon_set_cable_state(palmas_usb->edev, "USB-Host", true); > + dev_info(palmas_usb->dev, "USB-Host cable is attached\n"); > } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) && > (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) { > palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE, > PALMAS_USB_ID_INT_LATCH_CLR, > PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT); > palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; > - extcon_set_cable_state(palmas_usb->edev, "USB-HOST", false); > - dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); > + extcon_set_cable_state(palmas_usb->edev, "USB-Host", false); > + dev_info(palmas_usb->dev, "USB-Host cable is detached\n"); > } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) && > (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) { > palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; > - extcon_set_cable_state(palmas_usb->edev, "USB-HOST", false); > - dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); > + extcon_set_cable_state(palmas_usb->edev, "USB-Host", false); > + dev_info(palmas_usb->dev, "USB-Host cable is detached\n"); > } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) && > (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) { > palmas_usb->linkstat = PALMAS_USB_STATE_ID; > - extcon_set_cable_state(palmas_usb->edev, "USB-HOST", true); > - dev_info(palmas_usb->dev, " USB-HOST cable is attached\n"); > + extcon_set_cable_state(palmas_usb->edev, "USB-Host", true); > + dev_info(palmas_usb->dev, " USB-Host cable is attached\n"); > } > > return IRQ_HANDLED; > diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c > index 172d64e..6713ad9 100644 > --- a/drivers/usb/dwc3/dwc3-omap.c > +++ b/drivers/usb/dwc3/dwc3-omap.c > @@ -445,14 +445,14 @@ static int dwc3_omap_extcon_register(struct dwc3_omap > *omap) > > omap->id_nb.notifier_call = dwc3_omap_id_notifier; > ret = extcon_register_interest(&omap->extcon_id_dev, > -edev->name, "USB-HOST", > +edev->name, "USB-Host", > &omap->id_nb); > if (ret < 0) > - dev_vdbg(omap->dev, "failed to register notifier for > USB-HOST\n"); > + dev_vdbg(omap->dev, "failed to register notifier for > USB-Host\n"); > > if (extcon_get_cable_state(edev, "USB") == true) > dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID); > - if (extcon_get_cable_state(edev, "USB-HOST") == true) > + if (extcon_get_cable_state(edev, "USB-Host") == true) > dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND); > } > > diff --git a/drivers/usb/phy/phy-omap-otg.c b/drivers/usb/phy/phy-omap-otg.c > index 56ee760..53cba3f 100644 > --- a/drivers/usb/phy/phy-omap-otg.c > +++ b/drivers/usb/phy/phy-omap-otg.c > @@ -119,7 +119,7 @@ static int omap_otg_probe(struct platform_device *pdev) > otg_dev->vbus_nb.notifier_call = omap_otg_vbus_notifier; > > ret = extcon_register_interest(&otg_dev->id_dev, con
[PATCH 2/5] usb: extcon: Fix USB-Host cable name
The recommended name for USB-Host cable state is "USB-Host" and not "USB-HOST" as per drivers/extcon/extcon-class.c extcon_cable_name. Change all instances of "USB-HOST" to "USB-Host". Signed-off-by: Roger Quadros --- drivers/extcon/extcon-palmas.c | 18 +- drivers/usb/dwc3/dwc3-omap.c | 6 +++--- drivers/usb/phy/phy-omap-otg.c | 4 ++-- drivers/usb/phy/phy-tahvo.c| 8 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index 11c6757..6d002c3 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -31,7 +31,7 @@ static const char *palmas_extcon_cable[] = { [0] = "USB", - [1] = "USB-HOST", + [1] = "USB-Host", NULL, }; @@ -93,26 +93,26 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb) PALMAS_USB_ID_INT_LATCH_CLR, PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND); palmas_usb->linkstat = PALMAS_USB_STATE_ID; - extcon_set_cable_state(palmas_usb->edev, "USB-HOST", true); - dev_info(palmas_usb->dev, "USB-HOST cable is attached\n"); + extcon_set_cable_state(palmas_usb->edev, "USB-Host", true); + dev_info(palmas_usb->dev, "USB-Host cable is attached\n"); } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) && (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) { palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE, PALMAS_USB_ID_INT_LATCH_CLR, PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT); palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; - extcon_set_cable_state(palmas_usb->edev, "USB-HOST", false); - dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); + extcon_set_cable_state(palmas_usb->edev, "USB-Host", false); + dev_info(palmas_usb->dev, "USB-Host cable is detached\n"); } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) && (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) { palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; - extcon_set_cable_state(palmas_usb->edev, "USB-HOST", false); - dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); + extcon_set_cable_state(palmas_usb->edev, "USB-Host", false); + dev_info(palmas_usb->dev, "USB-Host cable is detached\n"); } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) && (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) { palmas_usb->linkstat = PALMAS_USB_STATE_ID; - extcon_set_cable_state(palmas_usb->edev, "USB-HOST", true); - dev_info(palmas_usb->dev, " USB-HOST cable is attached\n"); + extcon_set_cable_state(palmas_usb->edev, "USB-Host", true); + dev_info(palmas_usb->dev, " USB-Host cable is attached\n"); } return IRQ_HANDLED; diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 172d64e..6713ad9 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -445,14 +445,14 @@ static int dwc3_omap_extcon_register(struct dwc3_omap *omap) omap->id_nb.notifier_call = dwc3_omap_id_notifier; ret = extcon_register_interest(&omap->extcon_id_dev, - edev->name, "USB-HOST", + edev->name, "USB-Host", &omap->id_nb); if (ret < 0) - dev_vdbg(omap->dev, "failed to register notifier for USB-HOST\n"); + dev_vdbg(omap->dev, "failed to register notifier for USB-Host\n"); if (extcon_get_cable_state(edev, "USB") == true) dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID); - if (extcon_get_cable_state(edev, "USB-HOST") == true) + if (extcon_get_cable_state(edev, "USB-Host") == true) dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND); } diff --git a/drivers/usb/phy/phy-omap-otg.c b/drivers/usb/phy/phy-omap-otg.c index 56ee760..53cba3f 100644 --- a/drivers/usb/phy/phy-omap-otg.c +++ b/drivers/usb/phy/phy-omap-otg.c @@ -119,7 +119,7 @@ static int omap_otg_probe(struct platform_device *pdev) otg_dev->vbus_nb.notifier_call = omap_otg_vbus_notifier; ret = extcon_register_interest(&otg_dev->id_dev, config->extcon, - "USB-HOST", &otg_dev->id_nb); + "USB-Host", &otg_dev->id_nb); if (ret) return ret; @@ -130,7 +130,7 @@ static int omap_otg_probe(struct platform_device *pdev) return ret;