From: Greg Kroah-Hartman Date: Fri, 19 Dec 2014 22:56:36 +0000 (-0800) Subject: greybus: greybus_host_device: rename modules -> interfaces X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1cd56a80969d7c5cfc74d847c6f81cc2ab8dc829;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git greybus: greybus_host_device: rename modules -> interfaces This is really a list of interfaces, not modules, so rename it so that we don't get confused when we really do add modules to the whole system later on. Reviewed-by: Alex Elder Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c index 3e00055bf4ae..c90f74c7a25e 100644 --- a/drivers/staging/greybus/core.c +++ b/drivers/staging/greybus/core.c @@ -183,7 +183,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver kref_init(&hd->kref); hd->parent = parent; hd->driver = driver; - INIT_LIST_HEAD(&hd->modules); + INIT_LIST_HEAD(&hd->interfaces); INIT_LIST_HEAD(&hd->connections); ida_init(&hd->cport_id_map); diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h index 707189286dd9..ced329af2a2d 100644 --- a/drivers/staging/greybus/greybus.h +++ b/drivers/staging/greybus/greybus.h @@ -99,7 +99,7 @@ struct greybus_host_device { struct device *parent; const struct greybus_host_driver *driver; - struct list_head modules; + struct list_head interfaces; struct list_head connections; struct ida cport_id_map; u8 device_id; diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c index 67b14df8a179..d4ec7884c01e 100644 --- a/drivers/staging/greybus/interface.c +++ b/drivers/staging/greybus/interface.c @@ -79,7 +79,7 @@ struct gb_interface *gb_interface_find(struct greybus_host_device *hd, { struct gb_interface *intf; - list_for_each_entry(intf, &hd->modules, links) + list_for_each_entry(intf, &hd->interfaces, links) if (intf->module_id == module_id) return intf; @@ -147,7 +147,7 @@ static struct gb_interface *gb_interface_create(struct greybus_host_device *hd, } spin_lock_irq(&gb_modules_lock); - list_add_tail(&intf->links, &hd->modules); + list_add_tail(&intf->links, &hd->interfaces); spin_unlock_irq(&gb_modules_lock); return intf; @@ -229,6 +229,6 @@ void gb_remove_interfaces(struct greybus_host_device *hd) { struct gb_interface *intf, *temp; - list_for_each_entry_safe(intf, temp, &hd->modules, links) + list_for_each_entry_safe(intf, temp, &hd->interfaces, links) gb_interface_destroy(intf); } diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h index 70dad49ec00b..5dd2c20dc286 100644 --- a/drivers/staging/greybus/interface.h +++ b/drivers/staging/greybus/interface.h @@ -15,7 +15,7 @@ struct gb_interface { struct device dev; struct list_head bundles; - struct list_head links; /* greybus_host_device->modules */ + struct list_head links; /* greybus_host_device->interfaces */ u8 module_id; /* Physical location within the Endo */ /* Information taken from the manifest module descriptor */