Commit 7422a1ec authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

greybus: protocol: name protocols.

We want to be able to "blame" a protocol for things at times, so give
them a name we can refer to them by.  Announce when they are added or
removed from the system so we have a chance to know what is going on
in the kernel logs.
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
parent e5646710
...@@ -359,6 +359,7 @@ static void gb_battery_connection_exit(struct gb_connection *connection) ...@@ -359,6 +359,7 @@ static void gb_battery_connection_exit(struct gb_connection *connection)
} }
static struct gb_protocol battery_protocol = { static struct gb_protocol battery_protocol = {
.name = "battery",
.id = GREYBUS_PROTOCOL_BATTERY, .id = GREYBUS_PROTOCOL_BATTERY,
.major = 0, .major = 0,
.minor = 1, .minor = 1,
......
...@@ -524,6 +524,7 @@ static void gb_gpio_connection_exit(struct gb_connection *connection) ...@@ -524,6 +524,7 @@ static void gb_gpio_connection_exit(struct gb_connection *connection)
} }
static struct gb_protocol gpio_protocol = { static struct gb_protocol gpio_protocol = {
.name = "gpio",
.id = GREYBUS_PROTOCOL_GPIO, .id = GREYBUS_PROTOCOL_GPIO,
.major = 0, .major = 0,
.minor = 1, .minor = 1,
......
...@@ -430,6 +430,7 @@ static void gb_i2c_connection_exit(struct gb_connection *connection) ...@@ -430,6 +430,7 @@ static void gb_i2c_connection_exit(struct gb_connection *connection)
} }
static struct gb_protocol i2c_protocol = { static struct gb_protocol i2c_protocol = {
.name = "i2c",
.id = GREYBUS_PROTOCOL_I2C, .id = GREYBUS_PROTOCOL_I2C,
.major = 0, .major = 0,
.minor = 1, .minor = 1,
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* Released under the GPLv2 only. * Released under the GPLv2 only.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "greybus.h" #include "greybus.h"
/* Global list of registered protocols */ /* Global list of registered protocols */
...@@ -86,6 +88,8 @@ int __gb_protocol_register(struct gb_protocol *protocol, struct module *module) ...@@ -86,6 +88,8 @@ int __gb_protocol_register(struct gb_protocol *protocol, struct module *module)
list_add_tail(&protocol->links, &existing->links); list_add_tail(&protocol->links, &existing->links);
spin_unlock_irq(&gb_protocols_lock); spin_unlock_irq(&gb_protocols_lock);
pr_info("Registered %s protocol.\n", protocol->name);
/* /*
* Go try to bind any unbound connections, as we have a * Go try to bind any unbound connections, as we have a
* new protocol in the system * new protocol in the system
...@@ -124,6 +128,9 @@ int gb_protocol_deregister(struct gb_protocol *protocol) ...@@ -124,6 +128,9 @@ int gb_protocol_deregister(struct gb_protocol *protocol)
} }
spin_unlock_irq(&gb_protocols_lock); spin_unlock_irq(&gb_protocols_lock);
if (protocol)
pr_info("Deregistered %s protocol.\n", protocol->name);
return protocol && !protocol_count; return protocol && !protocol_count;
} }
EXPORT_SYMBOL_GPL(gb_protocol_deregister); EXPORT_SYMBOL_GPL(gb_protocol_deregister);
......
...@@ -35,6 +35,7 @@ struct gb_protocol { ...@@ -35,6 +35,7 @@ struct gb_protocol {
gb_connection_exit_t connection_exit; gb_connection_exit_t connection_exit;
gb_request_recv_t request_recv; gb_request_recv_t request_recv;
struct module *owner; struct module *owner;
char *name;
}; };
int __gb_protocol_register(struct gb_protocol *protocol, struct module *module); int __gb_protocol_register(struct gb_protocol *protocol, struct module *module);
......
...@@ -311,6 +311,7 @@ static void gb_pwm_connection_exit(struct gb_connection *connection) ...@@ -311,6 +311,7 @@ static void gb_pwm_connection_exit(struct gb_connection *connection)
} }
static struct gb_protocol pwm_protocol = { static struct gb_protocol pwm_protocol = {
.name = "pwm",
.id = GREYBUS_PROTOCOL_PWM, .id = GREYBUS_PROTOCOL_PWM,
.major = 0, .major = 0,
.minor = 1, .minor = 1,
......
...@@ -79,6 +79,7 @@ static void gb_sdio_connection_exit(struct gb_connection *connection) ...@@ -79,6 +79,7 @@ static void gb_sdio_connection_exit(struct gb_connection *connection)
} }
static struct gb_protocol sdio_protocol = { static struct gb_protocol sdio_protocol = {
.name = "sdio",
.id = GREYBUS_PROTOCOL_SDIO, .id = GREYBUS_PROTOCOL_SDIO,
.major = 0, .major = 0,
.minor = 1, .minor = 1,
......
...@@ -767,6 +767,7 @@ static void gb_tty_exit(void) ...@@ -767,6 +767,7 @@ static void gb_tty_exit(void)
} }
static struct gb_protocol uart_protocol = { static struct gb_protocol uart_protocol = {
.name = "uart",
.id = GREYBUS_PROTOCOL_UART, .id = GREYBUS_PROTOCOL_UART,
.major = 0, .major = 0,
.minor = 1, .minor = 1,
......
...@@ -376,6 +376,7 @@ static void gb_usb_connection_exit(struct gb_connection *connection) ...@@ -376,6 +376,7 @@ static void gb_usb_connection_exit(struct gb_connection *connection)
} }
static struct gb_protocol usb_protocol = { static struct gb_protocol usb_protocol = {
.name = "usb",
.id = GREYBUS_PROTOCOL_USB, .id = GREYBUS_PROTOCOL_USB,
.major = 0, .major = 0,
.minor = 1, .minor = 1,
......
...@@ -197,6 +197,7 @@ static void gb_vibrator_connection_exit(struct gb_connection *connection) ...@@ -197,6 +197,7 @@ static void gb_vibrator_connection_exit(struct gb_connection *connection)
} }
static struct gb_protocol vibrator_protocol = { static struct gb_protocol vibrator_protocol = {
.name = "vibrator",
.id = GREYBUS_PROTOCOL_VIBRATOR, .id = GREYBUS_PROTOCOL_VIBRATOR,
.major = 0, .major = 0,
.minor = 1, .minor = 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment