Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c34e22c4 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Mayank Rana
Browse files

USB: gadget: android: Integrate f_midi USB MIDI gadget driver part deux 



free_ep_req and alloc_ep_req are static open coded and conflicting
in f_midi.c. The exported versions are present in f_sourcesink.c.
Changed names to protect the innocent.

Change-Id: I4aee40054b5715d0532d433d23dea2bccff7ec30
Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Git-commit: ae2019d83ecf14454315240c16dc3136212f0da2
Git-repo: https://android.googlesource.com/kernel/common/


[mrana@codeaurora.org: already alloc_ep_req renamed, merge conflict]
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent 4be3b7e0

drivers/usb/gadget/function/f_midi.c

+4 −4
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static inline struct usb_request *midi_alloc_ep_req(struct usb_ep *ep, 
	return alloc_ep_req(ep, length, length);

}



static void free_ep_req(struct usb_ep *ep, struct usb_request *req)

static void midi_free_ep_req(struct usb_ep *ep, struct usb_request *req)

{

	kfree(req->buf);

	usb_ep_free_request(ep, req);
@@ -275,7 +275,7 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req) 
		if (ep == midi->out_ep)

			f_midi_handle_out_data(ep, req);



		free_ep_req(ep, req);

		midi_free_ep_req(ep, req);

		return;



	case -EOVERFLOW:	/* buffer overrun on read means that
@@ -546,7 +546,7 @@ static void f_midi_transmit(struct f_midi *midi, struct usb_request *req) 
		req = midi_alloc_ep_req(ep, midi->buflen);



	if (!req) {

		ERROR(midi, "gmidi_transmit: alloc_ep_request failed\n");

		ERROR(midi, "gmidi_transmit: midi_alloc_ep_request failed\n");

		return;

	}

	req->length = 0;
@@ -572,7 +572,7 @@ static void f_midi_transmit(struct f_midi *midi, struct usb_request *req) 
	if (req->length > 0)

		usb_ep_queue(ep, req, GFP_ATOMIC);

	else

		free_ep_req(ep, req);

		midi_free_ep_req(ep, req);

}



static void f_midi_in_tasklet(unsigned long data)