redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

greybus: interface: separate initialisation and registration 

Separate interface initialisation from registration of the interface and
its bundles.

This is a step towards registering also interfaces that failed to
initialise (e.g. a dummy interface).

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Reviewed-by: Jeffrey Carlyle <jcarlyle@google.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
hifive-unleashed-5.1
Johan Hovold 2016-03-09 12:20:36 +01:00 committed by Greg Kroah-Hartman
parent 39495a2bea
commit 7a137fb290
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/greybus/interface.c
View File

@ -179,16 +179,12 @@ void gb_interfaces_remove(struct gb_host_device *hd)
gb_interface_remove(intf);
}
/**
* gb_interface_init
*
* Create connection for control CPort and then request/parse manifest.
* Finally initialize all the bundles to set routes via SVC and initialize all
* connections.
/*
* Intialise an interface by enabling the control connection and fetching the
* manifest and other information over it.
*/
int gb_interface_init(struct gb_interface *intf)
{
struct gb_bundle *bundle, *tmp;
int ret, size;
void *manifest;
@ -236,11 +232,22 @@ int gb_interface_init(struct gb_interface *intf)
if (ret)
goto free_manifest;
/* Register the interface and its bundles. */
free_manifest:
kfree(manifest);
return ret;
}
/* Register an interface and its bundles. */
int gb_interface_add(struct gb_interface *intf)
{
struct gb_bundle *bundle, *tmp;
int ret;
ret = device_add(&intf->dev);
if (ret) {
dev_err(&intf->dev, "failed to register interface: %d\n", ret);
goto free_manifest;
return ret;
}
dev_info(&intf->dev, "Interface added: VID=0x%08x, PID=0x%08x\n",
@ -256,9 +263,5 @@ int gb_interface_init(struct gb_interface *intf)
}
}
ret = 0;
free_manifest:
kfree(manifest);
return ret;
return 0;
}

1
drivers/staging/greybus/interface.h
View File

@ -48,6 +48,7 @@ struct gb_interface *gb_interface_find(struct gb_host_device *hd,
struct gb_interface *gb_interface_create(struct gb_host_device *hd,
u8 interface_id);
int gb_interface_init(struct gb_interface *intf);
int gb_interface_add(struct gb_interface *intf);
void gb_interface_remove(struct gb_interface *intf);
void gb_interfaces_remove(struct gb_host_device *hd);

4
drivers/staging/greybus/svc.c
View File

@ -629,6 +629,10 @@ static void gb_svc_process_intf_hotplug(struct gb_operation *operation)
goto destroy_route;
}
ret = gb_interface_add(intf);
if (ret)
goto destroy_route;
return;
destroy_route: