diff --git a/drivers/staging/greybus/battery-gb.c b/drivers/staging/greybus/battery-gb.c
index 592b68d5115a..185fa2c4b55f 100644
--- a/drivers/staging/greybus/battery-gb.c
+++ b/drivers/staging/greybus/battery-gb.c
@@ -369,7 +369,7 @@ int gb_battery_device_init(struct gb_connection *connection)
 	if (!gb)
 		return -ENOMEM;
 
-	gb->connection = connection;	// FIXME refcount!
+	gb->connection = connection;
 	connection->private = gb;
 
 	/* Check the version */
diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index 2d3421f6aa10..722bee4579ea 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -179,7 +179,7 @@ struct gb_connection *gb_connection_create(struct gb_interface *interface,
 		return NULL;
 	}
 
-	connection->interface = interface;	/* XXX refcount? */
+	connection->interface = interface;
 	connection->interface_cport_id = cport_id;
 	connection->protocol = protocol;
 	connection->state = GB_CONNECTION_STATE_DISABLED;
diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index a7375a2809d5..163cdc439e0c 100644
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -61,7 +61,7 @@ gb_interface_create(struct gb_module *gmod, u8 interface_id)
 	if (!interface)
 		return NULL;
 
-	interface->gmod = gmod;		/* XXX refcount? */
+	interface->gmod = gmod;
 	interface->id = interface_id;
 	interface->device_id = 0xff;	/* Invalid device id to start with */
 	INIT_LIST_HEAD(&interface->connections);
diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index 9b889b169bf5..df3a50227625 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -349,7 +349,7 @@ struct gb_operation *gb_operation_create(struct gb_connection *connection,
 	operation = kmem_cache_zalloc(gb_operation_cache, gfp_flags);
 	if (!operation)
 		return NULL;
-	operation->connection = connection;		/* XXX refcount? */
+	operation->connection = connection;
 
 	operation->request = gb_operation_gbuf_create(operation, type,
 							request_size,