On Wed, Oct 26, 2022 at 08:02:49AM +0100, Conor Dooley wrote:
> On Wed, Oct 26, 2022 at 08:11:57PM +0800, Xu Yang wrote:
> > If CONFIG_PM_SLEEP is not set, the following error will be shown up
> > when build kernel:
> > error: 'ci_handle_power_lost' defined but not used.
> >
> > This will move ci_handle_power_lost() to an area wrapped by
> > CONFIG_PM_SLEEP.
> >
> > Signed-off-by: Xu Yang <xu.yang_2@xxxxxxx>
> > Fixes: 74494b33211d ("usb: chipidea: core: add controller resume support when controller is powered off")
>
> Reported-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
> Tested-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
>
> Thanks for the quick fix. BTW, your mails show up timestamped in the
> future, maybe something's up with the TZ on your machine.
Hey Greg (I'm assuming you apply the chipidea stuff directly),
Apologies for the ping, this is a fix for the allmodconfig build on
RISC-V in -next so it'd be nice to get it applied.
Thanks,
Conor.
> > ---
> > drivers/usb/chipidea/core.c | 38 ++++++++++++++++++-------------------
> > 1 file changed, 19 insertions(+), 19 deletions(-)
> >
> > diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> > index 2b170b434d01..484b1cd23431 100644
> > --- a/drivers/usb/chipidea/core.c
> > +++ b/drivers/usb/chipidea/core.c
> > @@ -661,25 +661,6 @@ static enum ci_role ci_get_role(struct ci_hdrc *ci)
> > return role;
> > }
> >
> > -static void ci_handle_power_lost(struct ci_hdrc *ci)
> > -{
> > - enum ci_role role;
> > -
> > - disable_irq_nosync(ci->irq);
> > - if (!ci_otg_is_fsm_mode(ci)) {
> > - role = ci_get_role(ci);
> > -
> > - if (ci->role != role) {
> > - ci_handle_id_switch(ci);
> > - } else if (role == CI_ROLE_GADGET) {
> > - if (ci->is_otg && hw_read_otgsc(ci, OTGSC_BSV))
> > - usb_gadget_vbus_connect(&ci->gadget);
> > - }
> > - }
> > -
> > - enable_irq(ci->irq);
> > -}
> > -
> > static struct usb_role_switch_desc ci_role_switch = {
> > .set = ci_usb_role_switch_set,
> > .get = ci_usb_role_switch_get,
> > @@ -1400,6 +1381,25 @@ static int ci_suspend(struct device *dev)
> > return 0;
> > }
> >
> > +static void ci_handle_power_lost(struct ci_hdrc *ci)
> > +{
> > + enum ci_role role;
> > +
> > + disable_irq_nosync(ci->irq);
> > + if (!ci_otg_is_fsm_mode(ci)) {
> > + role = ci_get_role(ci);
> > +
> > + if (ci->role != role) {
> > + ci_handle_id_switch(ci);
> > + } else if (role == CI_ROLE_GADGET) {
> > + if (ci->is_otg && hw_read_otgsc(ci, OTGSC_BSV))
> > + usb_gadget_vbus_connect(&ci->gadget);
> > + }
> > + }
> > +
> > + enable_irq(ci->irq);
> > +}
> > +
> > static int ci_resume(struct device *dev)
> > {
> > struct ci_hdrc *ci = dev_get_drvdata(dev);
> > --
> > 2.34.1
> >
> >
>
