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

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

mei: amthif: drop mei_clear_lists function 



Open code mei_clear_lists into its only caller mei_amthif_releas
and drop unused parameter 'dev' form from mei_clear_list function.

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 a808c80c

drivers/misc/mei/amthif.c

+5 −22
Original line number Diff line number Diff line
@@ -408,15 +408,14 @@ void mei_amthif_complete(struct mei_cl *cl, struct mei_cl_cb *cb) 
 * mei_clear_list - removes all callbacks associated with file

 *		from mei_cb_list

 *

 * @dev: device structure.

 * @file: file structure

 * @mei_cb_list: callbacks list

 *

 * mei_clear_list is called to clear resources associated with file

 * when application calls close function or Ctrl-C was pressed

 */

static void mei_clear_list(struct mei_device *dev,

		const struct file *file, struct list_head *mei_cb_list)

static void mei_clear_list(const struct file *file,

			   struct list_head *mei_cb_list)

{

	struct mei_cl_cb *cb, *next;
@@ -425,24 +424,6 @@ static void mei_clear_list(struct mei_device *dev, 
			mei_io_cb_free(cb);

}



/**

 * mei_clear_lists - removes all callbacks associated with file

 *

 * @dev: device structure

 * @file: file structure

 *

 * mei_clear_lists is called to clear resources associated with file

 * when application calls close function or Ctrl-C was pressed

 */

static void mei_clear_lists(struct mei_device *dev, const struct file *file)

{

	struct mei_cl *cl = &dev->iamthif_cl;



	mei_clear_list(dev, file, &dev->amthif_cmd_list.list);

	mei_clear_list(dev, file, &cl->rd_completed);

	mei_clear_list(dev, file, &dev->ctrl_rd_list.list);

}



/**

* mei_amthif_release - the release function

*
@@ -465,7 +446,9 @@ int mei_amthif_release(struct mei_device *dev, struct file *file) 
		dev->iamthif_canceled = true;

	}



	mei_clear_lists(dev, file);

	mei_clear_list(file, &dev->amthif_cmd_list.list);

	mei_clear_list(file, &cl->rd_completed);

	mei_clear_list(file, &dev->ctrl_rd_list.list);



	return 0;

}