diff --git a/drivers/staging/greybus/ap.c b/drivers/staging/greybus/ap.c
index 113fd878c634..869f934732fc 100644
--- a/drivers/staging/greybus/ap.c
+++ b/drivers/staging/greybus/ap.c
@@ -167,8 +167,7 @@ static void svc_hotplug(struct svc_function_hotplug *hotplug,
 	switch (hotplug->hotplug_event) {
 	case SVC_HOTPLUG_EVENT:
 		/* Add a new interface to the system */
-		if (payload_length < 0x03) {
-			/* Hotplug message is at least 3 bytes big */
+		if (payload_length != sizeof(*hotplug)) {
 			dev_err(hd->parent,
 				"Illegal size of svc hotplug message %d\n",
 				payload_length);
@@ -180,8 +179,7 @@ static void svc_hotplug(struct svc_function_hotplug *hotplug,
 
 	case SVC_HOTUNPLUG_EVENT:
 		/* Remove a interface from the system */
-		if (payload_length != 0x02) {
-			/* Hotunplug message is only 2 bytes big */
+		if (payload_length != sizeof(*hotplug)) {
 			dev_err(hd->parent,
 				"Illegal size of svc hotunplug message %d\n",
 				payload_length);
diff --git a/drivers/staging/greybus/svc_msg.h b/drivers/staging/greybus/svc_msg.h
index fadc1d70952e..3c628c5d6e38 100644
--- a/drivers/staging/greybus/svc_msg.h
+++ b/drivers/staging/greybus/svc_msg.h
@@ -82,7 +82,6 @@ enum svc_function_hotplug_event {
 struct svc_function_hotplug {
 	__u8	hotplug_event;	/* enum svc_function_hotplug_event */
 	__u8	interface_id;	/* Interface id within the Endo */
-	__u8	data[0];
 } __packed;
 
 enum svc_function_power_type {