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

Commit db086fa9 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: move mei_cl_complete to client.c 



1. rename mei_cl_complete_handler to mei_cl_complete
2. move the function client.c where it belongs

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7d87ca1

drivers/misc/mei/client.c

+26 −0
Original line number Diff line number Diff line
@@ -785,6 +785,32 @@ int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking) 
}





/**

 * mei_cl_complete - processes completed operation for a client

 *

 * @cl: private data of the file object.

 * @cb: callback block.

 */

void mei_cl_complete(struct mei_cl *cl, struct mei_cl_cb *cb)

{

	if (cb->fop_type == MEI_FOP_WRITE) {

		mei_io_cb_free(cb);

		cb = NULL;

		cl->writing_state = MEI_WRITE_COMPLETE;

		if (waitqueue_active(&cl->tx_wait))

			wake_up_interruptible(&cl->tx_wait);



	} else if (cb->fop_type == MEI_FOP_READ &&

			MEI_READING == cl->reading_state) {

		cl->reading_state = MEI_READ_COMPLETE;

		if (waitqueue_active(&cl->rx_wait))

			wake_up_interruptible(&cl->rx_wait);

		else

			mei_cl_bus_rx_event(cl);



	}

}





/**

 * mei_cl_all_disconnect - disconnect forcefully all connected clients

drivers/misc/mei/client.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ int mei_cl_disconnect(struct mei_cl *cl); 
int mei_cl_connect(struct mei_cl *cl, struct file *file);

int mei_cl_read_start(struct mei_cl *cl, size_t length);

int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking);

void mei_cl_complete(struct mei_cl *cl, struct mei_cl_cb *cb);



void mei_host_client_init(struct work_struct *work);

drivers/misc/mei/interrupt.c

+1 −27
Original line number Diff line number Diff line
@@ -30,32 +30,6 @@ 
#include "client.h"





/**

 * mei_cl_complete_handler - processes completed operation for a client

 *

 * @cl: private data of the file object.

 * @cb: callback block.

 */

static void mei_cl_complete_handler(struct mei_cl *cl, struct mei_cl_cb *cb)

{

	if (cb->fop_type == MEI_FOP_WRITE) {

		mei_io_cb_free(cb);

		cb = NULL;

		cl->writing_state = MEI_WRITE_COMPLETE;

		if (waitqueue_active(&cl->tx_wait))

			wake_up_interruptible(&cl->tx_wait);



	} else if (cb->fop_type == MEI_FOP_READ &&

			MEI_READING == cl->reading_state) {

		cl->reading_state = MEI_READ_COMPLETE;

		if (waitqueue_active(&cl->rx_wait))

			wake_up_interruptible(&cl->rx_wait);

		else

			mei_cl_bus_rx_event(cl);



	}

}



/**

 * mei_irq_compl_handler - dispatch complete handelers

 *	for the completed callbacks
@@ -78,7 +52,7 @@ void mei_irq_compl_handler(struct mei_device *dev, struct mei_cl_cb *compl_list) 
		if (cl == &dev->iamthif_cl)

			mei_amthif_complete(dev, cb);

		else

			mei_cl_complete_handler(cl, cb);

			mei_cl_complete(cl, cb);

	}

}

EXPORT_SYMBOL_GPL(mei_irq_compl_handler);