diff options
author | Felipe Balbi <balbi@ti.com> | 2012-07-19 01:53:41 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-08-03 02:28:25 -0400 |
commit | 4635d3f29864d723a74983339ffc85db212e304b (patch) | |
tree | 31d29640e8dddd739f2399334da76b55f16cfe4a /drivers/usb/dwc3/ep0.c | |
parent | d9b33c605c398df1d42c694bda28fe8708754c64 (diff) |
usb: dwc3: ep0: drop dead code
There's no such thing as XferNotReady(SETUP), we
can safely drop all that code with no problems
whatsoever.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/dwc3/ep0.c')
-rw-r--r-- | drivers/usb/dwc3/ep0.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 28bce9be30bc..d4b38c72a0ac 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c | |||
@@ -809,12 +809,6 @@ static void dwc3_ep0_xfer_complete(struct dwc3 *dwc, | |||
809 | } | 809 | } |
810 | } | 810 | } |
811 | 811 | ||
812 | static void dwc3_ep0_do_control_setup(struct dwc3 *dwc, | ||
813 | const struct dwc3_event_depevt *event) | ||
814 | { | ||
815 | dwc3_ep0_out_start(dwc); | ||
816 | } | ||
817 | |||
818 | static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, | 812 | static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, |
819 | struct dwc3_ep *dep, struct dwc3_request *req) | 813 | struct dwc3_ep *dep, struct dwc3_request *req) |
820 | { | 814 | { |
@@ -926,50 +920,7 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc, | |||
926 | { | 920 | { |
927 | dwc->setup_packet_pending = true; | 921 | dwc->setup_packet_pending = true; |
928 | 922 | ||
929 | /* | ||
930 | * This part is very tricky: If we have just handled | ||
931 | * XferNotReady(Setup) and we're now expecting a | ||
932 | * XferComplete but, instead, we receive another | ||
933 | * XferNotReady(Setup), we should STALL and restart | ||
934 | * the state machine. | ||
935 | * | ||
936 | * In all other cases, we just continue waiting | ||
937 | * for the XferComplete event. | ||
938 | * | ||
939 | * We are a little bit unsafe here because we're | ||
940 | * not trying to ensure that last event was, indeed, | ||
941 | * XferNotReady(Setup). | ||
942 | * | ||
943 | * Still, we don't expect any condition where that | ||
944 | * should happen and, even if it does, it would be | ||
945 | * another error condition. | ||
946 | */ | ||
947 | if (dwc->ep0_next_event == DWC3_EP0_COMPLETE) { | ||
948 | switch (event->status) { | ||
949 | case DEPEVT_STATUS_CONTROL_SETUP: | ||
950 | dev_vdbg(dwc->dev, "Unexpected XferNotReady(Setup)\n"); | ||
951 | dwc3_ep0_stall_and_restart(dwc); | ||
952 | break; | ||
953 | case DEPEVT_STATUS_CONTROL_DATA: | ||
954 | /* FALLTHROUGH */ | ||
955 | case DEPEVT_STATUS_CONTROL_STATUS: | ||
956 | /* FALLTHROUGH */ | ||
957 | default: | ||
958 | dev_vdbg(dwc->dev, "waiting for XferComplete\n"); | ||
959 | } | ||
960 | |||
961 | return; | ||
962 | } | ||
963 | |||
964 | switch (event->status) { | 923 | switch (event->status) { |
965 | case DEPEVT_STATUS_CONTROL_SETUP: | ||
966 | dev_vdbg(dwc->dev, "Control Setup\n"); | ||
967 | |||
968 | dwc->ep0state = EP0_SETUP_PHASE; | ||
969 | |||
970 | dwc3_ep0_do_control_setup(dwc, event); | ||
971 | break; | ||
972 | |||
973 | case DEPEVT_STATUS_CONTROL_DATA: | 924 | case DEPEVT_STATUS_CONTROL_DATA: |
974 | dev_vdbg(dwc->dev, "Control Data\n"); | 925 | dev_vdbg(dwc->dev, "Control Data\n"); |
975 | 926 | ||