leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

greybus: svc: SVC is part of greybus core

Browse Source 
Its an essential part of greybus core and shouldn't be present as a
separate module. Make it part of greybus.ko module.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Viresh Kumar 2015-07-03 17:00:29 +05:30 committed by Greg Kroah-Hartman
parent 87c016ee90
commit ab69c4cea3
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/greybus/Makefile
View File

@ -9,6 +9,7 @@ greybus-y := core.o \
connection.o \ connection.o \
protocol.o \ protocol.o \
control.o \ control.o \
svc.o \
operation.o operation.o
gb-phy-y := gpbridge.o \ gb-phy-y := gpbridge.o \
@ -26,7 +27,6 @@ gb-phy-y := gpbridge.o \
audio-gb-cmds.o audio-gb-cmds.o
# Prefix all modules with gb- # Prefix all modules with gb-
gb-svc-y := svc.o
gb-vibrator-y := vibrator.o gb-vibrator-y := vibrator.o
gb-battery-y := battery.o gb-battery-y := battery.o
gb-loopback-y := loopback.o gb-loopback-y := loopback.o
@ -35,7 +35,6 @@ gb-es1-y := es1.o
gb-es2-y := es2.o gb-es2-y := es2.o
obj-m += greybus.o obj-m += greybus.o
obj-m += gb-svc.o
obj-m += gb-phy.o obj-m += gb-phy.o
obj-m += gb-vibrator.o obj-m += gb-vibrator.o
obj-m += gb-battery.o obj-m += gb-battery.o

9
drivers/staging/greybus/core.c
View File

@ -280,8 +280,16 @@ static int __init gb_init(void)
goto error_control; goto error_control;
} }
retval = gb_svc_protocol_init();
if (retval) {
pr_err("gb_svc_protocol_init failed\n");
goto error_svc;
}
return 0; /* Success */ return 0; /* Success */
error_svc:
gb_control_protocol_exit();
error_control: error_control:
gb_endo_exit(); gb_endo_exit();
error_endo: error_endo:
@ -299,6 +307,7 @@ module_init(gb_init);
static void __exit gb_exit(void) static void __exit gb_exit(void)
{ {
gb_svc_protocol_exit();
gb_control_protocol_exit(); gb_control_protocol_exit();
gb_endo_exit(); gb_endo_exit();
gb_operation_exit(); gb_operation_exit();

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

@ -239,5 +239,4 @@ static struct gb_protocol svc_protocol = {
.connection_exit = gb_svc_connection_exit, .connection_exit = gb_svc_connection_exit,
.request_recv = gb_svc_request_recv, .request_recv = gb_svc_request_recv,
}; };
gb_builtin_protocol_driver(svc_protocol);
gb_protocol_driver(&svc_protocol);

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

@ -19,4 +19,6 @@ int gb_svc_connection_create(struct gb_svc *svc, u8 intf1_id, u16 cport1_id,
int gb_svc_connection_destroy(struct gb_svc *svc, u8 intf1_id, u16 cport1_id, int gb_svc_connection_destroy(struct gb_svc *svc, u8 intf1_id, u16 cport1_id,
u8 intf2_id, u16 cport2_id); u8 intf2_id, u16 cport2_id);
int gb_svc_protocol_init(void);
void gb_svc_protocol_exit(void);
#endif /* __SVC_H */ #endif /* __SVC_H */