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

Commit bca7dbac authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: amthif: drop iamthif_current_cb 



iamthif_current_cb was used in request cancel in amthif code.
Now a canceled request is discarded only at the end of the processing
and the variable lost its purpose and can be safely removed.

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32a1dc1d

drivers/misc/mei/amthif.c

+0 −5
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ const uuid_le mei_amthif_guid = UUID_LE(0x12f80028, 0xb4b7, 0x4b2d, 
void mei_amthif_reset_params(struct mei_device *dev)

{

	/* reset iamthif parameters. */

	dev->iamthif_current_cb = NULL;

	dev->iamthif_canceled = false;

	dev->iamthif_state = MEI_IAMTHIF_IDLE;

	dev->iamthif_stall_timer = 0;
@@ -213,7 +212,6 @@ static int mei_amthif_read_start(struct mei_cl *cl, const struct file *file) 


	dev->iamthif_state = MEI_IAMTHIF_READING;

	dev->iamthif_fp = cb->fp;

	dev->iamthif_current_cb = cb;



	return 0;

err:
@@ -240,7 +238,6 @@ static int mei_amthif_send_cmd(struct mei_cl *cl, struct mei_cl_cb *cb) 
	dev = cl->dev;



	dev->iamthif_state = MEI_IAMTHIF_WRITING;

	dev->iamthif_current_cb = cb;

	dev->iamthif_fp = cb->fp;

	dev->iamthif_canceled = false;
@@ -407,7 +404,6 @@ void mei_amthif_complete(struct mei_cl *cl, struct mei_cl_cb *cb) 
			mei_io_cb_free(cb);

			return;

		}

		dev->iamthif_current_cb = NULL;

		dev->iamthif_state = MEI_IAMTHIF_IDLE;

		dev->iamthif_fp = NULL;

		if (!dev->iamthif_canceled) {
@@ -430,7 +426,6 @@ void mei_amthif_complete(struct mei_cl *cl, struct mei_cl_cb *cb) 
			mei_io_cb_free(cb);

		}



		dev->iamthif_current_cb = NULL;

		dev->iamthif_stall_timer = 0;

		mei_amthif_run_next_cmd(dev);

		break;

drivers/misc/mei/interrupt.c

+0 −3
Original line number Diff line number Diff line
@@ -515,9 +515,6 @@ void mei_timer(struct work_struct *work) 
			dev_err(dev->dev, "timer: amthif  hanged.\n");

			mei_reset(dev);



			mei_io_cb_free(dev->iamthif_current_cb);

			dev->iamthif_current_cb = NULL;



			dev->iamthif_fp = NULL;

			mei_amthif_run_next_cmd(dev);

		}

drivers/misc/mei/mei_dev.h

+0 −2
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ const char *mei_pg_state_str(enum mei_pg_state state); 
 * @amthif_cmd_list : amthif list for cmd waiting

 * @iamthif_fp : file for current amthif operation

 * @iamthif_cl  : amthif host client

 * @iamthif_current_cb : amthif current operation callback

 * @iamthif_open_count : number of opened amthif connections

 * @iamthif_stall_timer : timer to detect amthif hang

 * @iamthif_state : amthif processor state
@@ -485,7 +484,6 @@ struct mei_device { 
	/* driver managed amthif list for reading completed amthif cmd data */

	const struct file *iamthif_fp;

	struct mei_cl iamthif_cl;

	struct mei_cl_cb *iamthif_current_cb;

	long iamthif_open_count;

	u32 iamthif_stall_timer;

	enum iamthif_states iamthif_state;