diff --git a/drivers/staging/greybus/hd.h b/drivers/staging/greybus/hd.h
index fe6c086a8e3d..b481dd03bd73 100644
--- a/drivers/staging/greybus/hd.h
+++ b/drivers/staging/greybus/hd.h
@@ -48,7 +48,7 @@ struct gb_host_device {
 	/* Private data for the host driver */
 	unsigned long hd_priv[0] __aligned(sizeof(s64));
 };
-#define to_gb_host_device(d) container_of(d, struct gb_host_device, d)
+#define to_gb_host_device(d) container_of(d, struct gb_host_device, dev)
 
 struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
 					struct device *parent,
diff --git a/drivers/staging/greybus/svc.h b/drivers/staging/greybus/svc.h
index 0436f49ef8fa..2f23bc081f82 100644
--- a/drivers/staging/greybus/svc.h
+++ b/drivers/staging/greybus/svc.h
@@ -41,7 +41,7 @@ struct gb_svc {
 	char                    *input_phys;
 	struct gb_svc_watchdog	*watchdog;
 };
-#define to_gb_svc(d) container_of(d, struct gb_svc, d)
+#define to_gb_svc(d) container_of(d, struct gb_svc, dev)
 
 struct gb_svc *gb_svc_create(struct gb_host_device *hd);
 int gb_svc_add(struct gb_svc *svc);