From c69b98d15fff68e83396d800f43508a1dab4130a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 16 Oct 2015 16:53:46 -0700 Subject: [PATCH] greybus: core: remove uevent handling for gb_connection As we are going to be removing the struct device from gb_connection, there is no need to do anything for uevents for them. So just remove the code. It wasn't doing anything anyway, so no functionality is lost here at all. As is_gb_connection() is no longer used, that is also removed in this patch. Signed-off-by: Greg Kroah-Hartman Reviewed-by: Viresh Kumar Reviewed-by: Alex Elder Reviewed-by: Johan Hovold --- drivers/staging/greybus/core.c | 11 ----------- drivers/staging/greybus/greybus.h | 5 ----- 2 files changed, 16 deletions(-) diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c index ea23aaf..5e1c755 100644 --- a/drivers/staging/greybus/core.c +++ b/drivers/staging/greybus/core.c @@ -47,7 +47,6 @@ static int greybus_uevent(struct device *dev, struct kobj_uevent_env *env) struct gb_module *module = NULL; struct gb_interface *intf = NULL; struct gb_bundle *bundle = NULL; - struct gb_connection *connection = NULL; if (is_gb_endo(dev)) { /* @@ -64,21 +63,11 @@ static int greybus_uevent(struct device *dev, struct kobj_uevent_env *env) } else if (is_gb_bundle(dev)) { bundle = to_gb_bundle(dev); intf = bundle->intf; - } else if (is_gb_connection(dev)) { - connection = to_gb_connection(dev); - bundle = connection->bundle; - intf = bundle->intf; } else { dev_WARN(dev, "uevent for unknown greybus device \"type\"!\n"); return -EINVAL; } - if (connection) { - // FIXME - // add a uevent that can "load" a connection type - return 0; - } - if (bundle) { // FIXME // add a uevent that can "load" a bundle type diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h index ec4a738..ae597563 100644 --- a/drivers/staging/greybus/greybus.h +++ b/drivers/staging/greybus/greybus.h @@ -189,11 +189,6 @@ static inline int is_gb_bundle(const struct device *dev) return dev->type == &greybus_bundle_type; } -static inline int is_gb_connection(const struct device *dev) -{ - return dev->type == &greybus_connection_type; -} - static inline bool cport_id_valid(struct greybus_host_device *hd, u16 cport_id) { return cport_id != CPORT_ID_BAD && cport_id < hd->num_cports; -- 2.7.4