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;