diff --git a/drivers/staging/greybus/ap.c b/drivers/staging/greybus/ap.c
index e3684299b9f3..f4470b5b2972 100644
--- a/drivers/staging/greybus/ap.c
+++ b/drivers/staging/greybus/ap.c
@@ -294,7 +294,7 @@ static void ap_process_event(struct work_struct *work)
 	kfree(ap_msg);
 }
 
-int greybus_svc_in(u8 *data, int size, struct greybus_host_device *hd)
+int greybus_svc_in(struct greybus_host_device *hd, u8 *data, int size)
 {
 	struct ap_msg *ap_msg;
 
diff --git a/drivers/staging/greybus/es1-ap-usb.c b/drivers/staging/greybus/es1-ap-usb.c
index b6ab12450cd6..291da4018cc0 100644
--- a/drivers/staging/greybus/es1-ap-usb.c
+++ b/drivers/staging/greybus/es1-ap-usb.c
@@ -268,7 +268,7 @@ static void svc_in_callback(struct urb *urb)
 	/* We have a message, create a new message structure, add it to the
 	 * list, and wake up our thread that will process the messages.
 	 */
-	greybus_svc_in(urb->transfer_buffer, urb->actual_length, es1->hd);
+	greybus_svc_in(es1->hd, urb->transfer_buffer, urb->actual_length);
 
 exit:
 	/* resubmit the urb to get more messages */
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index 794822066c7b..1328dc9cc6f1 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -289,7 +289,7 @@ void gb_add_module(struct greybus_host_device *hd, u8 module_id,
 		   u8 *data, int size);
 void gb_remove_module(struct greybus_host_device *hd, u8 module_id);
 
-int greybus_svc_in(u8 *data, int length, struct greybus_host_device *hd);
+int greybus_svc_in(struct greybus_host_device *hd, u8 *data, int length);
 int gb_ap_init(void);
 void gb_ap_exit(void);
 int gb_debugfs_init(void);