From: Greg Kroah-Hartman <gregkh@google.com>
Date: Fri, 16 Oct 2015 23:53:46 +0000 (-0700)
Subject: greybus: core: remove uevent handling for gb_connection
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c69b98d15fff68e83396d800f43508a1dab4130a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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 <gregkh@google.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
---

diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index ea23aaff9465..5e1c75533d80 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 ec4a73884b09..ae5975632c5e 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;