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

mei: rename MEI_FOP_IOCTL to MEI_FOP_CONNECT 



This operation actually only support connection
and not a generic ioctl

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

drivers/misc/mei/amthif.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *cb) 
	if (ret)

		return ret;



	cb->fop_type = MEI_FOP_IOCTL;

	cb->fop_type = MEI_FOP_WRITE;



	if (!list_empty(&dev->amthif_cmd_list.list) ||

	    dev->iamthif_state != MEI_IAMTHIF_IDLE) {

drivers/misc/mei/client.c

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file) 
		goto out;

	}



	cb->fop_type = MEI_FOP_IOCTL;

	cb->fop_type = MEI_FOP_CONNECT;



	if (dev->hbuf_is_ready && !mei_cl_is_other_connecting(cl)) {

		dev->hbuf_is_ready = false;

drivers/misc/mei/hbm.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static void mei_hbm_cl_connect_res(struct mei_device *dev, 
			list_del(&pos->list);

			return;

		}

		if (pos->fop_type == MEI_FOP_IOCTL) {

		if (pos->fop_type == MEI_FOP_CONNECT) {

			if (is_treat_specially_client(cl, rs)) {

				list_del(&pos->list);

				cl->status = 0;

drivers/misc/mei/interrupt.c

+7 −7
Original line number Diff line number Diff line
@@ -244,8 +244,7 @@ static int mei_cl_irq_read(struct mei_cl *cl, struct mei_cl_cb *cb, 




/**

 * mei_cl_irq_ioctl - processes client ioctl related operation from the

 *	interrupt thread context -   send connection request

 * mei_cl_irq_connect - send connect request in irq_thread context

 *

 * @cl: client

 * @cb: callback block.
@@ -254,7 +253,7 @@ static int mei_cl_irq_read(struct mei_cl *cl, struct mei_cl_cb *cb, 
 *

 * returns 0, OK; otherwise, error.

 */

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

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

			   s32 *slots, struct mei_cl_cb *cmpl_list)

{

	struct mei_device *dev = cl->dev;
@@ -263,6 +262,9 @@ static int mei_cl_irq_ioctl(struct mei_cl *cl, struct mei_cl_cb *cb, 
	u32 msg_slots =

		mei_data2slots(sizeof(struct hbm_client_connect_request));



	if (mei_cl_is_other_connecting(cl))

		return 0;



	if (*slots < msg_slots) {

		/* return the cancel routine */

		list_del(&cb->list);
@@ -496,11 +498,9 @@ int mei_irq_write_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list) 
				return ret;



			break;

		case MEI_FOP_IOCTL:

		case MEI_FOP_CONNECT:

			/* connect message */

			if (mei_cl_is_other_connecting(cl))

				continue;

			ret = mei_cl_irq_ioctl(cl, cb, &slots, cmpl_list);

			ret = mei_cl_irq_connect(cl, cb, &slots, cmpl_list);

			if (ret)

				return ret;

drivers/misc/mei/mei_dev.h

+6 −6
Original line number Diff line number Diff line
@@ -132,14 +132,14 @@ enum mei_wd_states { 
 * enum mei_cb_file_ops  - file operation associated with the callback

 * @MEI_FOP_READ      - read

 * @MEI_FOP_WRITE     - write

 * @MEI_FOP_IOCTL  - ioctl

 * @MEI_FOP_CONNECT   - connect

 * @MEI_FOP_OPEN      - open

 * @MEI_FOP_CLOSE     - close

 */

enum mei_cb_file_ops {

	MEI_FOP_READ = 0,

	MEI_FOP_WRITE,

	MEI_FOP_IOCTL,

	MEI_FOP_CONNECT,

	MEI_FOP_OPEN,

	MEI_FOP_CLOSE

};