From 1db0a5ff3a32c78082e7ef0264e71aa8afa3be96 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 12 Dec 2014 17:10:17 -0500 Subject: greybus: bundle: s/gb_interface/gb_bundle/g Rename struct gb_interface to struct gb_bundle It's a lot of renaming, some structures got renamed and also some fields, but the goal was to rename things to make sense with the new naming of how the system is put together in the 'driver model' view. Reviewed-by: Alex Elder Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/bundle.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'drivers/staging/greybus/bundle.h') diff --git a/drivers/staging/greybus/bundle.h b/drivers/staging/greybus/bundle.h index c0c66b851c5d..ad14a47d64a8 100644 --- a/drivers/staging/greybus/bundle.h +++ b/drivers/staging/greybus/bundle.h @@ -1,5 +1,5 @@ /* - * Greybus interfaces + * Greybus bundles * * Copyright 2014 Google Inc. * Copyright 2014 Linaro Ltd. @@ -7,29 +7,28 @@ * Released under the GPLv2 only. */ -#ifndef __INTERFACE_H -#define __INTERFACE_H +#ifndef __BUNDLE_H +#define __BUNDLE_H #include -struct gb_interface { +/* Greybus "public" definitions" */ +struct gb_bundle { struct device dev; struct gb_interface_block *gb_ib; u8 id; u8 device_id; struct list_head connections; - struct list_head links; /* module->interfaces */ + struct list_head links; /* interface->bundles */ }; -#define to_gb_interface(d) container_of(d, struct gb_interface, dev) +#define to_gb_bundle(d) container_of(d, struct gb_bundle, dev) -struct gb_interface *gb_interface_create(struct gb_interface_block *gb_ib, u8 module_id); -void gb_interface_destroy(struct gb_interface_block *gb_ib); -int gb_interface_init(struct gb_interface_block *gb_ib, u8 module_id, u8 device_id); +/* Greybus "private" definitions" */ +struct gb_bundle *gb_bundle_create(struct gb_interface_block *gb_ib, u8 module_id); +void gb_bundle_destroy(struct gb_interface_block *gb_ib); +int gb_bundle_init(struct gb_interface_block *gb_ib, u8 module_id, u8 device_id); -struct gb_interface *gb_interface_find(struct gb_interface_block *gb_ib, u8 interface_id); +struct gb_bundle *gb_bundle_find(struct gb_interface_block *gb_ib, u8 bundle_id); -int gb_interface_connections_init(struct gb_interface *interface); -void gb_interface_connections_exit(struct gb_interface *interface); - -#endif /* __INTERFACE_H */ +#endif /* __BUNDLE_H */ -- cgit v1.2.3