From c85dba9e87376aa8e08fa7b024df562d0fda189b Mon Sep 17 00:00:00 2001 From: Alexander Usyskin Date: Thu, 16 Jun 2016 17:58:59 +0300 Subject: [PATCH] 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: Alexander Usyskin Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mei/amthif.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index e346af17d9f4..26568c5beb25 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -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; } -- 2.30.2