diff options
| author | Li Jun <jun.li@freescale.com> | 2015-06-18 14:52:11 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 09:23:52 -0500 |
| commit | 4a5bb341e6b97cf5632ae87fcc94288c970c2c8d (patch) | |
| tree | 12e2f990d308b63a7a42df3dd3c27dada27df23a /drivers/usb | |
| parent | 01ce1d48f480a615377f0ca14952dba0746b0d80 (diff) | |
MLK-11123-16 usb: chipidea: otg: remove adp_support from ci_hdrc_platform_data
Since we introduce usb_otg_caps in ci_hdrc_platform_data to cover all otg
related features, remove adp_support from ci_hdrc_platform_data.
Signed-off-by: Li Jun <jun.li@freescale.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/chipidea/otg_fsm.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c index d85844370064..f9c685bd462a 100644 --- a/drivers/usb/chipidea/otg_fsm.c +++ b/drivers/usb/chipidea/otg_fsm.c @@ -744,7 +744,7 @@ static void ci_otg_start_adp_prb(struct otg_fsm *fsm) { struct ci_hdrc *ci = container_of(fsm, struct ci_hdrc, fsm); - if (!ci->platdata->adp_support || !ci->hnp_enable) + if (!ci->platdata->ci_otg_caps.adp_support || !ci->hnp_enable) return; if (ci->platdata->notify_event) @@ -757,7 +757,8 @@ static void ci_otg_start_adp_sns(struct otg_fsm *fsm) { struct ci_hdrc *ci = container_of(fsm, struct ci_hdrc, fsm); - if (!ci->platdata->adp_support || !ci->hnp_enable || !ci->driver) + if (!ci->platdata->ci_otg_caps.adp_support || + !ci->hnp_enable || !ci->driver) return; /* TODO If power_up and vbus is off, do one ADP probe before SRP */ @@ -795,7 +796,8 @@ static int ci_otg_fsm_adp_work(struct ci_hdrc *ci) { struct otg_fsm *fsm = &ci->fsm; - if (!ci->platdata->notify_event || !ci->platdata->adp_support) + if (!ci->platdata->notify_event || + !ci->platdata->ci_otg_caps.adp_support) return -ENOTSUPP; if (ci->adp_probe_event) { @@ -999,7 +1001,8 @@ static irqreturn_t ci_otg_fsm_adp_int(struct ci_hdrc *ci) irqreturn_t retval = IRQ_NONE; bool adp_int = false; - if (!ci->platdata->notify_event || !ci->platdata->adp_support) + if (!ci->platdata->notify_event || + !ci->platdata->ci_otg_caps.adp_support) return retval; adp_int = ci->platdata->notify_event(ci, |