openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: bundles: remove gb_bundle(s)_init() 

They aren't used anymore, remove them. This also gets rid of
gb_bundle_connections_init().

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Viresh Kumar 2015-07-01 12:13:59 +05:30 committed by Greg Kroah-Hartman
parent c3add7883c
commit 5677d48b97
2 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/staging/greybus/bundle.c
View File

@ -10,8 +10,6 @@
#include "greybus.h"
static void gb_bundle_connections_exit(struct gb_bundle *bundle);
static int gb_bundle_connections_init(struct gb_bundle *bundle);
static ssize_t class_show(struct device *dev, struct device_attribute *attr,
char *buf)
@ -212,44 +210,6 @@ void gb_bundle_destroy(struct gb_bundle *bundle)
device_unregister(&bundle->dev);
}
int gb_bundle_init(struct gb_bundle *bundle)
{
struct gb_interface *intf = bundle->intf;
int ret;
/* Don't reinitialize control cport's bundle */
if (intf->control && bundle->id == GB_CONTROL_BUNDLE_ID)
return 0;
ret = gb_bundle_connections_init(bundle);
if (ret) {
dev_err(intf->hd->parent, "interface bundle init error %d\n",
ret);
/* XXX clear route */
return ret;
}
return 0;
}
int gb_bundles_init(struct gb_interface *intf)
{
struct gb_bundle *bundle;
int ret = 0;
list_for_each_entry(bundle, &intf->bundles, links) {
ret = gb_bundle_init(bundle);
if (ret) {
dev_err(intf->hd->parent,
"Failed to initialize bundle %hhu\n",
bundle->id);
break;
}
}
return ret;
}
struct gb_bundle *gb_bundle_find(struct gb_interface *intf, u8 bundle_id)
{
struct gb_bundle *bundle;
@ -265,20 +225,6 @@ struct gb_bundle *gb_bundle_find(struct gb_interface *intf, u8 bundle_id)
return bundle;
}
static int gb_bundle_connections_init(struct gb_bundle *bundle)
{
struct gb_connection *connection;
int ret = 0;
list_for_each_entry(connection, &bundle->connections, bundle_links) {
ret = gb_connection_init(connection);
if (ret)
break;
}
return ret;
}
static void gb_bundle_connections_exit(struct gb_bundle *bundle)
{
struct gb_connection *connection;

2
drivers/staging/greybus/bundle.h
View File

@ -31,8 +31,6 @@ struct gb_bundle {
struct gb_bundle *gb_bundle_create(struct gb_interface *intf, u8 bundle_id,
u8 class);
void gb_bundle_destroy(struct gb_bundle *bundle);
int gb_bundle_init(struct gb_bundle *bundle);
int gb_bundles_init(struct gb_interface *intf);
struct gb_bundle *gb_bundle_find(struct gb_interface *intf, u8 bundle_id);
void gb_bundle_bind_protocols(void);