diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 2020187b5d16..0850b591500f 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -609,7 +609,7 @@ static int cport_reset(struct gb_host_device *hd, u16 cport_id)
 {
 	struct es2_ap_dev *es2 = hd_to_es2(hd);
 	struct usb_device *udev = es2->usb_dev;
-	struct arpc_cport_reset req;
+	struct arpc_cport_reset_req req;
 	int retval;
 	int result = 0;
 
@@ -621,7 +621,7 @@ static int cport_reset(struct gb_host_device *hd, u16 cport_id)
 	}
 
 	req.cport_id = cpu_to_le16(cport_id);
-	retval = arpc_sync(es2, ARPC_CPORT_RESET, &req, sizeof(req),
+	retval = arpc_sync(es2, ARPC_TYPE_CPORT_RESET, &req, sizeof(req),
 			   &result, ES2_TIMEOUT);
 	if (retval == -EREMOTEIO) {
 		dev_err(&udev->dev, "failed to reset cport %u: %d\n", cport_id,
diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index d8f8194bd9dc..8484f05fc427 100644
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -292,9 +292,9 @@ struct arpc_response_message {
 	__u8	result;		/* Result of RPC */
 } __packed;
 
-#define ARPC_CPORT_RESET			0x00
+#define ARPC_TYPE_CPORT_RESET			0x00
 
-struct arpc_cport_reset {
+struct arpc_cport_reset_req {
 	__le16 cport_id;
 } __packed;