diff --git a/drivers/staging/greybus/ap.c b/drivers/staging/greybus/ap.c
index a3bf146e5562..35367174afb4 100644
--- a/drivers/staging/greybus/ap.c
+++ b/drivers/staging/greybus/ap.c
@@ -69,7 +69,6 @@ int svc_set_route_send(struct gb_interface *interface,
 	if (!svc_msg)
 		return -ENOMEM;
 
-	svc_msg->header.function_id = SVC_FUNCTION_UNIPRO_NETWORK_MANAGEMENT;
 	svc_msg->header.message_type = SVC_MSG_DATA;
 	svc_msg->header.payload_length =
 		cpu_to_le16(sizeof(struct svc_function_unipro_set_route));
@@ -111,7 +110,6 @@ static void svc_handshake(struct svc_function_handshake *handshake,
 	if (!svc_msg)
 		return;
 
-	svc_msg->header.function_id = SVC_FUNCTION_HANDSHAKE;
 	svc_msg->header.message_type = SVC_MSG_DATA;
 	svc_msg->header.payload_length =
 		cpu_to_le16(sizeof(*handshake));