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

Commit d9ff330d authored by Udipto Goswami's avatar Udipto Goswami
Browse files

usb: f_qdss: Remove QDSS read functionality as not in use 



Removing the APIs related to ctrl_read since those are
not used by any client of f_qdss.

Change-Id: Idf7f1ffd8afe8a72f83e036a7986d35f2f71bea8
Signed-off-by: default avatarUdipto Goswami <ugoswami@codeaurora.org>
parent 7caba938

drivers/hwtracing/coresight/coresight-byte-cntr.c

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ void usb_bypass_notifier(void *priv, unsigned int event, 


	switch (event) {

	case USB_QDSS_CONNECT:

		usb_qdss_alloc_req(ch, USB_BUF_NUM, 0);

		usb_qdss_alloc_req(ch, USB_BUF_NUM);

		usb_bypass_start(drvdata);

		queue_work(drvdata->usb_wq, &(drvdata->read_work));

		break;

drivers/soc/qcom/qdss_bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static void usb_notifier(void *priv, unsigned int event, 


	switch (event) {

	case USB_QDSS_CONNECT:

		usb_qdss_alloc_req(ch, drvdata->nr_trbs, 0);

		usb_qdss_alloc_req(ch, drvdata->nr_trbs);

		mhi_queue_read(drvdata);

		break;

drivers/usb/gadget/function/f_qdss.c

+3 −89
Original line number Diff line number Diff line
@@ -252,27 +252,6 @@ static void qdss_write_complete(struct usb_ep *ep, 
		qdss->ch.notify(qdss->ch.priv, state, d_req, NULL);

}



static void qdss_ctrl_read_complete(struct usb_ep *ep,

	struct usb_request *req)

{

	struct f_qdss *qdss = ep->driver_data;

	struct qdss_request *d_req = req->context;

	unsigned long flags;



	qdss_log("%s\n", __func__);



	d_req->actual = req->actual;

	d_req->status = req->status;



	spin_lock_irqsave(&qdss->lock, flags);

	list_add_tail(&req->list, &qdss->ctrl_read_pool);

	spin_unlock_irqrestore(&qdss->lock, flags);



	if (qdss->ch.notify)

		qdss->ch.notify(qdss->ch.priv, USB_QDSS_CTRL_READ_DONE, d_req,

			NULL);

}



void usb_qdss_free_req(struct usb_qdss_ch *ch)

{

	struct f_qdss *qdss;
@@ -298,17 +277,10 @@ void usb_qdss_free_req(struct usb_qdss_ch *ch) 
		list_del(&req->list);

		usb_ep_free_request(qdss->port.ctrl_in, req);

	}



	list_for_each_safe(act, tmp, &qdss->ctrl_read_pool) {

		req = list_entry(act, struct usb_request, list);

		list_del(&req->list);

		usb_ep_free_request(qdss->port.ctrl_out, req);

	}

}

EXPORT_SYMBOL(usb_qdss_free_req);



int usb_qdss_alloc_req(struct usb_qdss_ch *ch, int no_write_buf,

	int no_read_buf)

int usb_qdss_alloc_req(struct usb_qdss_ch *ch, int no_write_buf)

{

	struct f_qdss *qdss = ch->priv_usb;

	struct usb_request *req;
@@ -323,10 +295,8 @@ int usb_qdss_alloc_req(struct usb_qdss_ch *ch, int no_write_buf, 
		return -ENODEV;

	}



	if ((qdss->debug_inface_enabled &&

		(no_write_buf <= 0 || no_read_buf <= 0)) ||

		(!qdss->debug_inface_enabled &&

		(no_write_buf <= 0 || no_read_buf))) {

	if ((qdss->debug_inface_enabled && no_write_buf <= 0) ||

		(!qdss->debug_inface_enabled && no_write_buf <= 0)) {

		pr_err("%s: missing params\n", __func__);

		return -ENODEV;

	}
@@ -349,16 +319,6 @@ int usb_qdss_alloc_req(struct usb_qdss_ch *ch, int no_write_buf, 
		list_add_tail(&req->list, list_pool);

	}



	for (i = 0; i < no_read_buf; i++) {

		req = usb_ep_alloc_request(qdss->port.ctrl_out, GFP_ATOMIC);

		if (!req) {

			pr_err("%s: ctrl_out allocation err\n", __func__);

			goto fail;

		}

		req->complete = qdss_ctrl_read_complete;

		list_add_tail(&req->list, &qdss->ctrl_read_pool);

	}



	return 0;



fail:
@@ -810,7 +770,6 @@ static struct f_qdss *alloc_usb_qdss(char *channel_name) 
	spin_unlock_irqrestore(&qdss_lock, flags);



	spin_lock_init(&qdss->lock);

	INIT_LIST_HEAD(&qdss->ctrl_read_pool);

	INIT_LIST_HEAD(&qdss->ctrl_write_pool);

	INIT_LIST_HEAD(&qdss->data_write_pool);

	INIT_LIST_HEAD(&qdss->queued_data_pool);
@@ -820,51 +779,6 @@ static struct f_qdss *alloc_usb_qdss(char *channel_name) 
	return qdss;

}



int usb_qdss_ctrl_read(struct usb_qdss_ch *ch, struct qdss_request *d_req)

{

	struct f_qdss *qdss = ch->priv_usb;

	unsigned long flags;

	struct usb_request *req = NULL;



	qdss_log("%s\n", __func__);



	if (!qdss)

		return -ENODEV;



	spin_lock_irqsave(&qdss->lock, flags);



	if (qdss->usb_connected == 0) {

		spin_unlock_irqrestore(&qdss->lock, flags);

		return -EIO;

	}



	if (list_empty(&qdss->ctrl_read_pool)) {

		spin_unlock_irqrestore(&qdss->lock, flags);

		pr_err("error: %s list is empty\n", __func__);

		return -EAGAIN;

	}



	req = list_first_entry(&qdss->ctrl_read_pool, struct usb_request, list);

	list_del(&req->list);

	spin_unlock_irqrestore(&qdss->lock, flags);



	req->buf = d_req->buf;

	req->length = d_req->length;

	req->context = d_req;



	if (usb_ep_queue(qdss->port.ctrl_out, req, GFP_ATOMIC)) {

		/* If error add the link to linked list again*/

		spin_lock_irqsave(&qdss->lock, flags);

		list_add_tail(&req->list, &qdss->ctrl_read_pool);

		spin_unlock_irqrestore(&qdss->lock, flags);

		pr_err("qdss usb_ep_queue failed\n");

		return -EIO;

	}



	return 0;

}

EXPORT_SYMBOL(usb_qdss_ctrl_read);



int usb_qdss_ctrl_write(struct usb_qdss_ch *ch, struct qdss_request *d_req)

{

	struct f_qdss *qdss = ch->priv_usb;

drivers/usb/gadget/function/f_qdss.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct f_qdss { 
	bool debug_inface_enabled;

	struct usb_request *endless_req;

	struct usb_qdss_ch ch;

	struct list_head ctrl_read_pool;

	struct list_head ctrl_write_pool;



	/* for mdm channel SW path */

include/linux/usb/usb_qdss.h

+1 −13
Original line number Diff line number Diff line
@@ -46,12 +46,10 @@ struct usb_qdss_ch *usb_qdss_open(const char *name, void *priv, 
	void (*notify)(void *priv, unsigned int event,

		struct qdss_request *d_req, struct usb_qdss_ch *ch));

void usb_qdss_close(struct usb_qdss_ch *ch);

int usb_qdss_alloc_req(struct usb_qdss_ch *ch, int n_write, int n_read);

int usb_qdss_alloc_req(struct usb_qdss_ch *ch, int n_write);

void usb_qdss_free_req(struct usb_qdss_ch *ch);

int usb_qdss_read(struct usb_qdss_ch *ch, struct qdss_request *d_req);

int usb_qdss_write(struct usb_qdss_ch *ch, struct qdss_request *d_req);

int usb_qdss_ctrl_write(struct usb_qdss_ch *ch, struct qdss_request *d_req);

int usb_qdss_ctrl_read(struct usb_qdss_ch *ch, struct qdss_request *d_req);

#else

static inline struct usb_qdss_ch *usb_qdss_open(const char *name, void *priv,

		void (*n)(void *, unsigned int event,
@@ -60,11 +58,6 @@ static inline struct usb_qdss_ch *usb_qdss_open(const char *name, void *priv, 
	return ERR_PTR(-ENODEV);

}



static inline int usb_qdss_read(struct usb_qdss_ch *c, struct qdss_request *d)

{

	return -ENODEV;

}



static inline int usb_qdss_write(struct usb_qdss_ch *c, struct qdss_request *d)

{

	return -ENODEV;
@@ -76,11 +69,6 @@ static inline int usb_qdss_ctrl_write(struct usb_qdss_ch *c, 
	return -ENODEV;

}



static inline int usb_qdss_ctrl_read(struct usb_qdss_ch *c,

		struct qdss_request *d)

{

	return -ENODEV;

}

static inline int usb_qdss_alloc_req(struct usb_qdss_ch *c, int n_wr, int n_rd)

{

	return -ENODEV;