From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752601AbbFMTNT (ORCPT ); Sat, 13 Jun 2015 15:13:19 -0400 Received: from mga01.intel.com ([192.55.52.88]:29211 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751163AbbFMTMw (ORCPT ); Sat, 13 Jun 2015 15:12:52 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,608,1427785200"; d="scan'208";a="710414563" From: Tomas Winkler To: gregkh@linuxfoundation.org Cc: arnd@arndb.de, linux-kernel@vger.kernel.org, Tomas Winkler Subject: [char-misc-next 03/17] mei: bus: rename device_list to simple devices Date: Sat, 13 Jun 2015 22:11:35 +0300 Message-Id: <1434222709-10966-4-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1434222709-10966-1-git-send-email-tomas.winkler@intel.com> References: <1434222709-10966-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 Signed-off-by: Tomas Winkler --- drivers/misc/mei/bus.c | 4 ++-- drivers/misc/mei/init.c | 2 +- drivers/misc/mei/mei_dev.h | 5 ++--- drivers/misc/mei/nfc.c | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c index a40be68dd7aa..2ae7e521f029 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -203,7 +203,7 @@ struct mei_cl *mei_cl_bus_find_cl_by_uuid(struct mei_device *bus, { struct mei_cl *cl; - list_for_each_entry(cl, &bus->device_list, device_link) { + list_for_each_entry(cl, &bus->devices, device_link) { if (cl->cldev && cl->cldev->me_cl && !uuid_le_cmp(uuid, *mei_me_cl_uuid(cl->cldev->me_cl))) return cl; @@ -557,7 +557,7 @@ void mei_cl_bus_remove_devices(struct mei_device *bus) struct mei_cl *cl, *next; mutex_lock(&bus->device_lock); - list_for_each_entry_safe(cl, next, &bus->device_list, device_link) { + list_for_each_entry_safe(cl, next, &bus->devices, device_link) { if (cl->cldev) mei_cl_remove_device(cl->cldev); diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 94514b2c7a50..64331a5ce990 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -388,7 +388,7 @@ void mei_device_init(struct mei_device *dev, { /* setup our list array */ INIT_LIST_HEAD(&dev->file_list); - INIT_LIST_HEAD(&dev->device_list); + INIT_LIST_HEAD(&dev->devices); INIT_LIST_HEAD(&dev->me_clients); mutex_init(&dev->device_lock); init_rwsem(&dev->me_clients_rwsem); diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index bc65fb42aea9..2a1ab7958734 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h @@ -446,7 +446,7 @@ const char *mei_pg_state_str(enum mei_pg_state state); * @init_work : work item for the device init * @reset_work : work item for the device reset * - * @device_list : mei client bus list + * @devices : mei client bus list * * @dbgfs_dir : debugfs mei root directory * @@ -541,8 +541,7 @@ struct mei_device { struct work_struct init_work; struct work_struct reset_work; - /* List of bus devices */ - struct list_head device_list; + struct list_head devices; #if IS_ENABLED(CONFIG_DEBUG_FS) struct dentry *dbgfs_dir; diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c index 51a864a2b2b5..9bd76cda1608 100644 --- a/drivers/misc/mei/nfc.c +++ b/drivers/misc/mei/nfc.c @@ -357,7 +357,7 @@ int mei_nfc_host_init(struct mei_device *bus, struct mei_me_client *me_cl) goto err; } - list_add_tail(&cl_info->device_link, &bus->device_list); + list_add_tail(&cl_info->device_link, &bus->devices); ndev->cl_info = cl_info; @@ -367,7 +367,7 @@ int mei_nfc_host_init(struct mei_device *bus, struct mei_me_client *me_cl) goto err; } - list_add_tail(&cl->device_link, &bus->device_list); + list_add_tail(&cl->device_link, &bus->devices); ndev->cl = cl; -- 2.4.2