Commit e232b791 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

greybus: interface_block.c: rename the "interfaces" list "bundles" 



Alex pointed out one rename I missed previously, this fixes up the
interface_block list of bundles name.

Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 1db0a5ff

drivers/staging/greybus/bundle.c

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ struct gb_bundle *gb_bundle_create(struct gb_interface_block *gb_ib, u8 interfac 
	}



	spin_lock_irq(&gb_bundles_lock);

	list_add_tail(&bundle->links, &gb_ib->interfaces);

	list_add_tail(&bundle->links, &gb_ib->bundles);

	spin_unlock_irq(&gb_bundles_lock);



	return bundle;
@@ -101,7 +101,7 @@ void gb_bundle_destroy(struct gb_interface_block *gb_ib) 
		return;



	spin_lock_irq(&gb_bundles_lock);

	list_for_each_entry_safe(bundle, temp, &gb_ib->interfaces, links) {

	list_for_each_entry_safe(bundle, temp, &gb_ib->bundles, links) {

		list_del(&bundle->links);

		gb_bundle_connections_exit(bundle);

		device_del(&bundle->dev);
@@ -144,7 +144,7 @@ struct gb_bundle *gb_bundle_find(struct gb_interface_block *gb_ib, u8 bundle_id) 
	struct gb_bundle *bundle;



	spin_lock_irq(&gb_bundles_lock);

	list_for_each_entry(bundle, &gb_ib->interfaces, links)

	list_for_each_entry(bundle, &gb_ib->bundles, links)

		if (bundle->id == bundle_id) {

			spin_unlock_irq(&gb_bundles_lock);

			return bundle;

drivers/staging/greybus/interface_block.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static struct gb_interface_block *gb_ib_create(struct greybus_host_device *hd, 


	gb_ib->hd = hd;		/* XXX refcount? */

	gb_ib->module_id = module_id;

	INIT_LIST_HEAD(&gb_ib->interfaces);

	INIT_LIST_HEAD(&gb_ib->bundles);



	gb_ib->dev.parent = hd->parent;

	gb_ib->dev.bus = &greybus_bus_type;

drivers/staging/greybus/interface_block.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
struct gb_interface_block {

	struct device dev;



	struct list_head interfaces;

	struct list_head bundles;

	struct list_head links;	/* greybus_host_device->modules */

	u8 module_id;		/* Physical location within the Endo */