From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Chen Subject: Re: [PATCH v4 10/22] usb: chipidea: Consolidate extcon notifiers Date: Thu, 8 Sep 2016 09:23:48 +0800 Message-ID: <20160908012348.GF13903@b29397-desktop> References: <20160907213519.27340-1-stephen.boyd@linaro.org> <20160907213519.27340-11-stephen.boyd@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pa0-f65.google.com ([209.85.220.65]:35993 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752167AbcIHBXx (ORCPT ); Wed, 7 Sep 2016 21:23:53 -0400 Content-Disposition: inline In-Reply-To: <20160907213519.27340-11-stephen.boyd@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Stephen Boyd Cc: linux-usb@vger.kernel.org, Felipe Balbi , Arnd Bergmann , Neil Armstrong , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Andersson , Peter Chen , Greg Kroah-Hartman , Andy Gross , "Ivan T. Ivanov" , linux-arm-kernel@lists.infradead.org On Wed, Sep 07, 2016 at 02:35:07PM -0700, Stephen Boyd wrote: > The two extcon notifiers are almost the same except for the > variable name for the cable structure and the id notifier inverts > the cable->state logic. Make it the same and replace two > functions with one to save some lines. This also makes it so that > the id cable state is true when the id pin is pulled low, so we > change the name of ->state to ->connected to properly reflect > that we're interested in the cable being connected. > > Cc: Peter Chen > Cc: Greg Kroah-Hartman > Cc: "Ivan T. Ivanov" > Signed-off-by: Stephen Boyd > --- > drivers/usb/chipidea/core.c | 45 ++++++++++++-------------------------------- > drivers/usb/chipidea/otg.c | 8 ++++---- > include/linux/usb/chipidea.h | 4 ++-- > 3 files changed, 18 insertions(+), 39 deletions(-) > > diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c > index f144e1bbcc82..83bc2f2dd6a8 100644 > --- a/drivers/usb/chipidea/core.c > +++ b/drivers/usb/chipidea/core.c > @@ -577,35 +577,14 @@ static irqreturn_t ci_irq(int irq, void *data) > return ret; > } > > -static int ci_vbus_notifier(struct notifier_block *nb, unsigned long event, > - void *ptr) > +static int ci_cable_notifier(struct notifier_block *nb, unsigned long event, > + void *ptr) > { > - struct ci_hdrc_cable *vbus = container_of(nb, struct ci_hdrc_cable, nb); > - struct ci_hdrc *ci = vbus->ci; > + struct ci_hdrc_cable *cbl = container_of(nb, struct ci_hdrc_cable, nb); > + struct ci_hdrc *ci = cbl->ci; > > - if (event) > - vbus->state = true; > - else > - vbus->state = false; > - > - vbus->changed = true; > - > - ci_irq(ci->irq, ci); > - return NOTIFY_DONE; > -} > - > -static int ci_id_notifier(struct notifier_block *nb, unsigned long event, > - void *ptr) > -{ > - struct ci_hdrc_cable *id = container_of(nb, struct ci_hdrc_cable, nb); > - struct ci_hdrc *ci = id->ci; > - > - if (event) > - id->state = false; > - else > - id->state = true; > - > - id->changed = true; > + cbl->connected = event; > + cbl->changed = true; > > ci_irq(ci->irq, ci); > return NOTIFY_DONE; > @@ -714,27 +693,27 @@ static int ci_get_platdata(struct device *dev, > } > > cable = &platdata->vbus_extcon; > - cable->nb.notifier_call = ci_vbus_notifier; > + cable->nb.notifier_call = ci_cable_notifier; > cable->edev = ext_vbus; > > if (!IS_ERR(ext_vbus)) { > ret = extcon_get_cable_state_(cable->edev, EXTCON_USB); > if (ret) > - cable->state = true; > + cable->connected = true; > else > - cable->state = false; > + cable->connected = false; > } > > cable = &platdata->id_extcon; > - cable->nb.notifier_call = ci_id_notifier; > + cable->nb.notifier_call = ci_cable_notifier; > cable->edev = ext_id; > > if (!IS_ERR(ext_id)) { > ret = extcon_get_cable_state_(cable->edev, EXTCON_USB_HOST); > if (ret) > - cable->state = false; > + cable->connected = true; > else > - cable->state = true; > + cable->connected = false; > } > return 0; > } > diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c > index 0cf149edddd8..695f3fe3ae21 100644 > --- a/drivers/usb/chipidea/otg.c > +++ b/drivers/usb/chipidea/otg.c > @@ -44,7 +44,7 @@ u32 hw_read_otgsc(struct ci_hdrc *ci, u32 mask) > else > val &= ~OTGSC_BSVIS; > > - if (cable->state) > + if (cable->connected) > val |= OTGSC_BSV; > else > val &= ~OTGSC_BSV; > @@ -62,10 +62,10 @@ u32 hw_read_otgsc(struct ci_hdrc *ci, u32 mask) > else > val &= ~OTGSC_IDIS; > > - if (cable->state) > - val |= OTGSC_ID; > + if (cable->connected) > + val &= ~OTGSC_ID; /* host */ > else > - val &= ~OTGSC_ID; > + val |= OTGSC_ID; /* device */ > > if (cable->enabled) > val |= OTGSC_IDIE; > diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h > index d07b162073f7..7e3daa37cf60 100644 > --- a/include/linux/usb/chipidea.h > +++ b/include/linux/usb/chipidea.h > @@ -12,7 +12,7 @@ struct ci_hdrc; > > /** > * struct ci_hdrc_cable - structure for external connector cable state tracking > - * @state: current state of the line > + * @connected: true if cable is connected, false otherwise > * @changed: set to true when extcon event happen > * @enabled: set to true if we've enabled the vbus or id interrupt > * @edev: device which generate events > @@ -21,7 +21,7 @@ struct ci_hdrc; > * @conn: used for notification registration > */ > struct ci_hdrc_cable { > - bool state; > + bool connected; > bool changed; > bool enabled; > struct extcon_dev *edev; > -- Acked-by: Peter Chen -- Best Regards, Peter Chen From mboxrd@z Thu Jan 1 00:00:00 1970 From: hzpeterchen@gmail.com (Peter Chen) Date: Thu, 8 Sep 2016 09:23:48 +0800 Subject: [PATCH v4 10/22] usb: chipidea: Consolidate extcon notifiers In-Reply-To: <20160907213519.27340-11-stephen.boyd@linaro.org> References: <20160907213519.27340-1-stephen.boyd@linaro.org> <20160907213519.27340-11-stephen.boyd@linaro.org> Message-ID: <20160908012348.GF13903@b29397-desktop> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Sep 07, 2016 at 02:35:07PM -0700, Stephen Boyd wrote: > The two extcon notifiers are almost the same except for the > variable name for the cable structure and the id notifier inverts > the cable->state logic. Make it the same and replace two > functions with one to save some lines. This also makes it so that > the id cable state is true when the id pin is pulled low, so we > change the name of ->state to ->connected to properly reflect > that we're interested in the cable being connected. > > Cc: Peter Chen > Cc: Greg Kroah-Hartman > Cc: "Ivan T. Ivanov" > Signed-off-by: Stephen Boyd > --- > drivers/usb/chipidea/core.c | 45 ++++++++++++-------------------------------- > drivers/usb/chipidea/otg.c | 8 ++++---- > include/linux/usb/chipidea.h | 4 ++-- > 3 files changed, 18 insertions(+), 39 deletions(-) > > diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c > index f144e1bbcc82..83bc2f2dd6a8 100644 > --- a/drivers/usb/chipidea/core.c > +++ b/drivers/usb/chipidea/core.c > @@ -577,35 +577,14 @@ static irqreturn_t ci_irq(int irq, void *data) > return ret; > } > > -static int ci_vbus_notifier(struct notifier_block *nb, unsigned long event, > - void *ptr) > +static int ci_cable_notifier(struct notifier_block *nb, unsigned long event, > + void *ptr) > { > - struct ci_hdrc_cable *vbus = container_of(nb, struct ci_hdrc_cable, nb); > - struct ci_hdrc *ci = vbus->ci; > + struct ci_hdrc_cable *cbl = container_of(nb, struct ci_hdrc_cable, nb); > + struct ci_hdrc *ci = cbl->ci; > > - if (event) > - vbus->state = true; > - else > - vbus->state = false; > - > - vbus->changed = true; > - > - ci_irq(ci->irq, ci); > - return NOTIFY_DONE; > -} > - > -static int ci_id_notifier(struct notifier_block *nb, unsigned long event, > - void *ptr) > -{ > - struct ci_hdrc_cable *id = container_of(nb, struct ci_hdrc_cable, nb); > - struct ci_hdrc *ci = id->ci; > - > - if (event) > - id->state = false; > - else > - id->state = true; > - > - id->changed = true; > + cbl->connected = event; > + cbl->changed = true; > > ci_irq(ci->irq, ci); > return NOTIFY_DONE; > @@ -714,27 +693,27 @@ static int ci_get_platdata(struct device *dev, > } > > cable = &platdata->vbus_extcon; > - cable->nb.notifier_call = ci_vbus_notifier; > + cable->nb.notifier_call = ci_cable_notifier; > cable->edev = ext_vbus; > > if (!IS_ERR(ext_vbus)) { > ret = extcon_get_cable_state_(cable->edev, EXTCON_USB); > if (ret) > - cable->state = true; > + cable->connected = true; > else > - cable->state = false; > + cable->connected = false; > } > > cable = &platdata->id_extcon; > - cable->nb.notifier_call = ci_id_notifier; > + cable->nb.notifier_call = ci_cable_notifier; > cable->edev = ext_id; > > if (!IS_ERR(ext_id)) { > ret = extcon_get_cable_state_(cable->edev, EXTCON_USB_HOST); > if (ret) > - cable->state = false; > + cable->connected = true; > else > - cable->state = true; > + cable->connected = false; > } > return 0; > } > diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c > index 0cf149edddd8..695f3fe3ae21 100644 > --- a/drivers/usb/chipidea/otg.c > +++ b/drivers/usb/chipidea/otg.c > @@ -44,7 +44,7 @@ u32 hw_read_otgsc(struct ci_hdrc *ci, u32 mask) > else > val &= ~OTGSC_BSVIS; > > - if (cable->state) > + if (cable->connected) > val |= OTGSC_BSV; > else > val &= ~OTGSC_BSV; > @@ -62,10 +62,10 @@ u32 hw_read_otgsc(struct ci_hdrc *ci, u32 mask) > else > val &= ~OTGSC_IDIS; > > - if (cable->state) > - val |= OTGSC_ID; > + if (cable->connected) > + val &= ~OTGSC_ID; /* host */ > else > - val &= ~OTGSC_ID; > + val |= OTGSC_ID; /* device */ > > if (cable->enabled) > val |= OTGSC_IDIE; > diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h > index d07b162073f7..7e3daa37cf60 100644 > --- a/include/linux/usb/chipidea.h > +++ b/include/linux/usb/chipidea.h > @@ -12,7 +12,7 @@ struct ci_hdrc; > > /** > * struct ci_hdrc_cable - structure for external connector cable state tracking > - * @state: current state of the line > + * @connected: true if cable is connected, false otherwise > * @changed: set to true when extcon event happen > * @enabled: set to true if we've enabled the vbus or id interrupt > * @edev: device which generate events > @@ -21,7 +21,7 @@ struct ci_hdrc; > * @conn: used for notification registration > */ > struct ci_hdrc_cable { > - bool state; > + bool connected; > bool changed; > bool enabled; > struct extcon_dev *edev; > -- Acked-by: Peter Chen -- Best Regards, Peter Chen