From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754464AbcGVM5v (ORCPT ); Fri, 22 Jul 2016 08:57:51 -0400 Received: from mga14.intel.com ([192.55.52.115]:7459 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754390AbcGVM5s (ORCPT ); Fri, 22 Jul 2016 08:57:48 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,405,1464678000"; d="scan'208";a="738252049" From: Tomas Winkler To: Greg Kroah-Hartman Cc: Alexander Usyskin , linux-kernel@vger.kernel.org, Tomas Winkler Subject: [char-misc-next 04/12] mei: amthif: drop mei_clear_lists function Date: Fri, 22 Jul 2016 15:56:21 +0300 Message-Id: <1469192189-29042-5-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469192189-29042-1-git-send-email-tomas.winkler@intel.com> References: <1469192189-29042-1-git-send-email-tomas.winkler@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Usyskin 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 --- 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; @@ -426,24 +425,6 @@ static void mei_clear_list(struct mei_device *dev, } /** - * 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 * * @dev: device structure @@ -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.7.4