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

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

mei: use disconnect name consistently 



Rename mei_cl_irq_close to mei_cl_irq_disconnect
and MEI_FOP_CLOSE to MEI_FOP_DISCONNECT
Remove unused MEI_FOP_OPEN

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

drivers/misc/mei/client.c

+2 −1
Original line number Diff line number Diff line
@@ -516,7 +516,8 @@ int mei_cl_disconnect(struct mei_cl *cl) 
		goto free;

	}



	cb->fop_type = MEI_FOP_CLOSE;

	cb->fop_type = MEI_FOP_DISCONNECT;



	if (mei_hbuf_acquire(dev)) {

		if (mei_hbm_cl_disconnect_req(dev, cl)) {

			rets = -ENODEV;

drivers/misc/mei/interrupt.c

+4 −4
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static int mei_cl_irq_disconnect_rsp(struct mei_cl *cl, struct mei_cl_cb *cb, 




/**

 * mei_cl_irq_close - processes close related operation from

 * mei_cl_irq_disconnect - processes close related operation from

 *	interrupt thread context - send disconnect request

 *

 * @cl: client
@@ -204,7 +204,7 @@ static int mei_cl_irq_disconnect_rsp(struct mei_cl *cl, struct mei_cl_cb *cb, 
 *

 * returns 0, OK; otherwise, error.

 */

static int mei_cl_irq_close(struct mei_cl *cl, struct mei_cl_cb *cb,

static int mei_cl_irq_disconnect(struct mei_cl *cl, struct mei_cl_cb *cb,

			    struct mei_cl_cb *cmpl_list)

{

	struct mei_device *dev = cl->dev;
@@ -495,9 +495,9 @@ int mei_irq_write_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list) 
			return -ENODEV;

		}

		switch (cb->fop_type) {

		case MEI_FOP_CLOSE:

		case MEI_FOP_DISCONNECT:

			/* send disconnect message */

			ret = mei_cl_irq_close(cl, cb, cmpl_list);

			ret = mei_cl_irq_disconnect(cl, cb, cmpl_list);

			if (ret)

				return ret;

drivers/misc/mei/mei_dev.h

+2 −4
Original line number Diff line number Diff line
@@ -132,17 +132,15 @@ enum mei_wd_states { 
 * @MEI_FOP_READ      - read

 * @MEI_FOP_WRITE     - write

 * @MEI_FOP_CONNECT   - connect

 * @MEI_FOP_DISCONNECT - disconnect

 * @MEI_FOP_DISCONNECT_RSP - disconnect response

 * @MEI_FOP_OPEN      - open

 * @MEI_FOP_CLOSE     - close

 */

enum mei_cb_file_ops {

	MEI_FOP_READ = 0,

	MEI_FOP_WRITE,

	MEI_FOP_CONNECT,

	MEI_FOP_DISCONNECT,

	MEI_FOP_DISCONNECT_RSP,

	MEI_FOP_OPEN,

	MEI_FOP_CLOSE

};



/*