greybus: Merge branch 'master' into branch 'svc'.

This required some hand-tweaking in connection.c, hopefully I got it all
correct...
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

drivers/staging/greybus/audio-gb-cmds.c

@@ -12,37 +12,9 @@
 #include "greybus.h"
 #include "audio.h"
 
-#define GB_I2S_MGMT_VERSION_MAJOR		0x00
-#define GB_I2S_MGMT_VERSION_MINOR		0x01
-
-#define GB_I2S_DATA_VERSION_MAJOR		0x00
-#define GB_I2S_DATA_VERSION_MINOR		0x01
-
 /***********************************
  * GB I2S helper functions
  ***********************************/
-int gb_i2s_mgmt_get_version(struct gb_connection *connection)
-{
-	struct gb_protocol_version_response response;
-
-	memset(&response, 0, sizeof(response));
-	return gb_protocol_get_version(connection,
-				       GB_I2S_MGMT_TYPE_PROTOCOL_VERSION,
-				       NULL, 0, &response,
-				       GB_I2S_MGMT_VERSION_MAJOR);
-}
-
-int gb_i2s_data_get_version(struct gb_connection *connection)
-{
-	struct gb_protocol_version_response response;
-
-	memset(&response, 0, sizeof(response));
-	return gb_protocol_get_version(connection,
-				       GB_I2S_DATA_TYPE_PROTOCOL_VERSION,
-				       NULL, 0, &response,
-				       GB_I2S_DATA_VERSION_MAJOR);
-}
-
 int gb_i2s_mgmt_activate_cport(struct gb_connection *connection,
 				      uint16_t cport)
 {

drivers/staging/greybus/audio.c

@@ -225,12 +225,6 @@ static int gb_i2s_transmitter_connection_init(struct gb_connection *connection)
 		goto out_card;
 	}
 
-	ret = gb_i2s_data_get_version(connection);
-	if (ret) {
-		pr_err("i2s data get_version() failed: %d\n", ret);
-		goto out_get_ver;
-	}
-
 #if USE_RT5645
 	rt5647_info.addr = RT5647_I2C_ADDR;
 	strlcpy(rt5647_info.type, "rt5647", I2C_NAME_SIZE);
@@ -251,8 +245,10 @@ static int gb_i2s_transmitter_connection_init(struct gb_connection *connection)
 
 	return 0;
 
+#if USE_RT5645
 out_get_ver:
 	platform_device_unregister(&snd_dev->card);
+#endif
 out_card:
 	platform_device_unregister(&snd_dev->cpu_dai);
 out_dai:
@@ -296,12 +292,6 @@ static int gb_i2s_mgmt_connection_init(struct gb_connection *connection)
 	connection->private = snd_dev;
 	spin_unlock_irqrestore(&snd_dev->lock, flags);
 
-	ret = gb_i2s_mgmt_get_version(connection);
-	if (ret) {
-		pr_err("i2s mgmt get_version() failed: %d\n", ret);
-		goto err_free_snd_dev;
-	}
-
 	ret = gb_i2s_mgmt_get_cfgs(snd_dev, connection);
 	if (ret) {
 		pr_err("can't get i2s configurations: %d\n", ret);
@@ -357,7 +347,7 @@ static int gb_i2s_mgmt_report_event_recv(u8 type, struct gb_operation *op)
 	}
 
 	if (op->request->payload_size < sizeof(*req)) {
-		dev_err(&connection->dev, "Short request received: %zu, %zu\n",
+		dev_err(&connection->dev, "Short request received (%zu < %zu)\n",
 			op->request->payload_size, sizeof(*req));
 		return -EINVAL;
 	}

drivers/staging/greybus/audio.h

@@ -75,8 +75,6 @@ struct gb_snd {
 /*
  * GB I2S cmd functions
  */
-int gb_i2s_mgmt_get_version(struct gb_connection *connection);
-int gb_i2s_data_get_version(struct gb_connection *connection);
 int gb_i2s_mgmt_activate_cport(struct gb_connection *connection,
 				      uint16_t cport);
 int gb_i2s_mgmt_deactivate_cport(struct gb_connection *connection,

drivers/staging/greybus/battery.c

@@ -32,8 +32,6 @@ struct gb_battery {
 	// updates from the SVC "on the fly" so we don't have to always go ask
 	// the battery for some information.  Hopefully...
 	struct gb_connection *connection;
-	u8 version_major;
-	u8 version_minor;
 
 };
 
@@ -42,8 +40,6 @@ struct gb_battery {
 #define	GB_BATTERY_VERSION_MINOR		0x01
 
 /* Greybus battery request types */
-#define	GB_BATTERY_TYPE_INVALID			0x00
-#define	GB_BATTERY_TYPE_PROTOCOL_VERSION	0x01
 #define	GB_BATTERY_TYPE_TECHNOLOGY		0x02
 #define	GB_BATTERY_TYPE_STATUS			0x03
 #define	GB_BATTERY_TYPE_MAX_VOLTAGE		0x04
@@ -94,9 +90,6 @@ struct gb_battery_voltage_response {
 	__le32	voltage;
 };
 
-/* Define get_version() routine */
-define_get_version(gb_battery, BATTERY);
-
 static int get_tech(struct gb_battery *gb)
 {
 	struct gb_battery_technology_response tech_response;
@@ -345,12 +338,7 @@ static int gb_battery_connection_init(struct gb_connection *connection)
 	gb->connection = connection;
 	connection->private = gb;
 
-	/* Check the version */
-	retval = get_version(gb);
-	if (retval)
-		goto out;
 	retval = init_and_register(connection, gb);
-out:
 	if (retval)
 		kfree(gb);
 
@@ -372,8 +360,8 @@ static void gb_battery_connection_exit(struct gb_connection *connection)
 static struct gb_protocol battery_protocol = {
 	.name			= "battery",
 	.id			= GREYBUS_PROTOCOL_BATTERY,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_BATTERY_VERSION_MAJOR,
+	.minor			= GB_BATTERY_VERSION_MINOR,
 	.connection_init	= gb_battery_connection_init,
 	.connection_exit	= gb_battery_connection_exit,
 	.request_recv		= NULL,	/* no incoming requests */

drivers/staging/greybus/connection.c

@@ -335,6 +335,28 @@ void gb_connection_destroy(struct gb_connection *connection)
 	device_unregister(&connection->dev);
 }
 
+static void gb_connection_disconnected(struct gb_connection *connection)
+{
+	struct gb_control *control;
+	int cport_id = connection->intf_cport_id;
+	int ret;
+
+	/*
+	 * Inform Interface about In-active CPorts. We don't need to do this
+	 * operation for control cport.
+	 */
+	if ((cport_id == GB_CONTROL_CPORT_ID) ||
+	    (connection->hd_cport_id == GB_SVC_CPORT_ID))
+		return;
+
+	control = connection->bundle->intf->control;
+
+	ret = gb_control_disconnected_operation(control, cport_id);
+	if (ret)
+		dev_warn(&connection->dev,
+			"Failed to disconnect CPort-%d (%d)\n", cport_id, ret);
+}
+
 int gb_connection_init(struct gb_connection *connection)
 {
 	int cport_id = connection->intf_cport_id;
@@ -367,20 +389,35 @@ int gb_connection_init(struct gb_connection *connection)
 	connection->state = GB_CONNECTION_STATE_ENABLED;
 	spin_unlock_irq(&connection->lock);
 
-	ret = connection->protocol->connection_init(connection);
+	/*
+	 * Request protocol version supported by the module. We don't need to do
+	 * this for SVC as that is initiated by the SVC.
+	 */
+	if (connection->hd_cport_id != GB_SVC_CPORT_ID) {
+		ret = gb_protocol_get_version(connection, NULL, 0);
 		if (ret) {
+			dev_err(&connection->dev,
+				"Failed to get version CPort-%d (%d)\n",
+				cport_id, ret);
+			goto disconnect;
+		}
+	}
+
+	ret = connection->protocol->connection_init(connection);
+	if (!ret)
+		return 0;
+
+disconnect:
 	spin_lock_irq(&connection->lock);
 	connection->state = GB_CONNECTION_STATE_ERROR;
 	spin_unlock_irq(&connection->lock);
-	}
 
+	gb_connection_disconnected(connection);
 	return ret;
 }
 
 void gb_connection_exit(struct gb_connection *connection)
 {
-	int cport_id = connection->intf_cport_id;
-
 	if (!connection->protocol) {
 		dev_warn(&connection->dev, "exit without protocol.\n");
 		return;
@@ -397,22 +434,7 @@ void gb_connection_exit(struct gb_connection *connection)
 	gb_connection_cancel_operations(connection, -ESHUTDOWN);
 
 	connection->protocol->connection_exit(connection);
-
-	/*
-	 * Inform Interface about In-active CPorts. We don't need to do this
-	 * operation for control cport.
-	 */
-	if (cport_id != GB_CONTROL_CPORT_ID &&
-	    connection->hd_cport_id != GB_SVC_CPORT_ID) {
-		struct gb_control *control = connection->bundle->intf->control;
-		int ret;
-
-		ret = gb_control_disconnected_operation(control, cport_id);
-		if (ret)
-			dev_warn(&connection->dev,
-				 "Failed to disconnect CPort-%d (%d)\n",
-				 cport_id, ret);
-	}
+	gb_connection_disconnected(connection);
 }
 
 void gb_hd_connections_exit(struct greybus_host_device *hd)

drivers/staging/greybus/connection.h

@@ -34,6 +34,8 @@ struct gb_connection {
 	u8				protocol_id;
 	u8				major;
 	u8				minor;
+	u8				module_major;
+	u8				module_minor;
 
 	spinlock_t			lock;
 	enum gb_connection_state	state;

drivers/staging/greybus/control.c

@@ -12,9 +12,6 @@
 #include <linux/slab.h>
 #include "greybus.h"
 
-/* Define get_version() routine */
-define_get_version(gb_control, CONTROL);
-
 /* Get Manifest's size from the interface */
 int gb_control_get_manifest_size_operation(struct gb_interface *intf)
 {
@@ -100,7 +97,6 @@ static int gb_control_request_recv(u8 type, struct gb_operation *op)
 static int gb_control_connection_init(struct gb_connection *connection)
 {
 	struct gb_control *control;
-	int ret;
 
 	control = kzalloc(sizeof(*control), GFP_KERNEL);
 	if (!control)
@@ -109,14 +105,10 @@ static int gb_control_connection_init(struct gb_connection *connection)
 	control->connection = connection;
 	connection->private = control;
 
-	ret = get_version(control);
-	if (ret)
-		kfree(control);
-
 	/* Set interface's control connection */
 	connection->bundle->intf->control = control;
 
-	return ret;
+	return 0;
 }
 
 static void gb_control_connection_exit(struct gb_connection *connection)

drivers/staging/greybus/control.h

@@ -12,8 +12,6 @@
 
 struct gb_control {
 	struct gb_connection	*connection;
-	u8			version_major;
-	u8			version_minor;
 };
 
 int gb_control_connected_operation(struct gb_control *control, u16 cport_id);

drivers/staging/greybus/gpio.c

@@ -33,8 +33,6 @@ struct gb_gpio_line {
 
 struct gb_gpio_controller {
 	struct gb_connection	*connection;
-	u8			version_major;
-	u8			version_minor;
 	u8			line_max;	/* max line number */
 	struct gb_gpio_line	*lines;
 
@@ -51,9 +49,6 @@ struct gb_gpio_controller {
 	container_of(chip, struct gb_gpio_controller, chip)
 #define irq_data_to_gpio_chip(d) (d->domain->host_data)
 
-/* Define get_version() routine */
-define_get_version(gb_gpio_controller, GPIO);
-
 static int gb_gpio_line_count_operation(struct gb_gpio_controller *ggc)
 {
 	struct gb_gpio_line_count_response response;
@@ -476,11 +471,6 @@ static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc)
 {
 	int ret;
 
-	/* First thing we need to do is check the version */
-	ret = get_version(ggc);
-	if (ret)
-		return ret;
-
 	/* Now find out how many lines there are */
 	ret = gb_gpio_line_count_operation(ggc);
 	if (ret)
@@ -719,8 +709,8 @@ static void gb_gpio_connection_exit(struct gb_connection *connection)
 static struct gb_protocol gpio_protocol = {
 	.name			= "gpio",
 	.id			= GREYBUS_PROTOCOL_GPIO,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_GPIO_VERSION_MAJOR,
+	.minor			= GB_GPIO_VERSION_MINOR,
 	.connection_init	= gb_gpio_connection_init,
 	.connection_exit	= gb_gpio_connection_exit,
 	.request_recv		= gb_gpio_request_recv,

drivers/staging/greybus/greybus_protocols.h

@@ -99,6 +99,10 @@ struct gb_operation_msg_hdr {
 };
 
 
+/* Generic request numbers supported by all modules */
+#define GB_REQUEST_TYPE_INVALID			0x00
+#define GB_REQUEST_TYPE_PROTOCOL_VERSION	0x01
+
 /* Control Protocol */
 
 /* version request has no payload */

drivers/staging/greybus/hid.c

@@ -68,8 +68,6 @@ struct gb_hid_input_report_request {
 /* Greybus HID device's structure */
 struct gb_hid {
 	struct gb_connection		*connection;
-	u8				version_major;
-	u8				version_minor;
 
 	struct hid_device		*hid;
 	struct gb_hid_desc_response	hdesc;
@@ -84,10 +82,7 @@ struct gb_hid {
 
 static DEFINE_MUTEX(gb_hid_open_mutex);
 
-/* Routines to get controller's infomation over greybus */
-
-/* Define get_version() routine */
-define_get_version(gb_hid, HID);
+/* Routines to get controller's information over greybus */
 
 /* Operations performed on greybus */
 static int gb_hid_get_desc(struct gb_hid *ghid)
@@ -445,10 +440,6 @@ static int gb_hid_init(struct gb_hid *ghid)
 	struct hid_device *hid = ghid->hid;
 	int ret;
 
-	ret = get_version(ghid);
-	if (ret)
-		return ret;
-
 	ret = gb_hid_get_desc(ghid);
 	if (ret)
 		return ret;
@@ -523,8 +514,8 @@ static void gb_hid_connection_exit(struct gb_connection *connection)
 static struct gb_protocol hid_protocol = {
 	.name			= "hid",
 	.id			= GREYBUS_PROTOCOL_HID,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_HID_VERSION_MAJOR,
+	.minor			= GB_HID_VERSION_MINOR,
 	.connection_init	= gb_hid_connection_init,
 	.connection_exit	= gb_hid_connection_exit,
 	.request_recv		= gb_hid_irq_handler,

drivers/staging/greybus/i2c.c

@@ -16,8 +16,6 @@
 
 struct gb_i2c_device {
 	struct gb_connection	*connection;
-	u8			version_major;
-	u8			version_minor;
 
 	u32			functionality;
 	u16			timeout_msec;
@@ -26,9 +24,6 @@ struct gb_i2c_device {
 	struct i2c_adapter	adapter;
 };
 
-/* Define get_version() routine */
-define_get_version(gb_i2c_device, I2C);
-
 /*
  * Map Greybus i2c functionality bits into Linux ones
  */
@@ -277,11 +272,6 @@ static int gb_i2c_device_setup(struct gb_i2c_device *gb_i2c_dev)
 {
 	int ret;
 
-	/* First thing we need to do is check the version */
-	ret = get_version(gb_i2c_dev);
-	if (ret)
-		return ret;
-
 	/* Assume the functionality never changes, just get it once */
 	ret = gb_i2c_functionality_operation(gb_i2c_dev);
 	if (ret)
@@ -349,8 +339,8 @@ static void gb_i2c_connection_exit(struct gb_connection *connection)
 static struct gb_protocol i2c_protocol = {
 	.name			= "i2c",
 	.id			= GREYBUS_PROTOCOL_I2C,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_I2C_VERSION_MAJOR,
+	.minor			= GB_I2C_VERSION_MINOR,
 	.connection_init	= gb_i2c_connection_init,
 	.connection_exit	= gb_i2c_connection_exit,
 	.request_recv		= NULL,	/* no incoming requests */

drivers/staging/greybus/loopback.c

@@ -31,8 +31,6 @@ struct gb_loopback_stats {
 
 struct gb_loopback {
 	struct gb_connection *connection;
-	u8 version_major;
-	u8 version_minor;
 
 	struct kfifo kfifo;
 	struct mutex mutex;
@@ -73,9 +71,6 @@ module_param(kfifo_depth, uint, 0444);
 
 #define GB_LOOPBACK_MS_WAIT_MAX				1000
 
-/* Define get_version() routine */
-define_get_version(gb_loopback, LOOPBACK);
-
 /* interface sysfs attributes */
 #define gb_loopback_ro_attr(field)					\
 static ssize_t field##_show(struct device *dev,				\
@@ -493,11 +488,6 @@ static int gb_loopback_connection_init(struct gb_connection *connection)
 		goto out_sysfs;
 	}
 
-	/* Check the version */
-	retval = get_version(gb);
-	if (retval)
-		goto out_minor;
-
 	/* Calculate maximum payload */
 	gb->size_max = gb_operation_get_payload_size_max(connection);
 	if (gb->size_max <= sizeof(struct gb_loopback_transfer_request)) {

drivers/staging/greybus/protocol.c

@@ -163,27 +163,30 @@ struct gb_protocol *gb_protocol_get(u8 id, u8 major, u8 minor)
 	return protocol;
 }
 
-int gb_protocol_get_version(struct gb_connection *connection, int type,
-			    void *request, int request_size,
-			    struct gb_protocol_version_response *response,
-			    __u8 major)
+int gb_protocol_get_version(struct gb_connection *connection, void *request,
+			    int request_size)
 {
+	struct gb_protocol_version_response response;
 	int retval;
 
-	retval = gb_operation_sync(connection, type, request, request_size,
-				   response, sizeof(*response));
+	retval = gb_operation_sync(connection, GB_REQUEST_TYPE_PROTOCOL_VERSION,
+				   request, request_size, &response,
+				   sizeof(response));
 	if (retval)
 		return retval;
 
-	if (response->major > major) {
+	if (response.major > connection->protocol->major) {
 		dev_err(&connection->dev,
 			"unsupported major version (%hhu > %hhu)\n",
-			response->major, major);
+			response.major, connection->protocol->major);
 		return -ENOTSUPP;
 	}
 
+	connection->module_major = response.major;
+	connection->module_minor = response.minor;
+
 	dev_dbg(&connection->dev, "version_major = %u version_minor = %u\n",
-		response->major, response->minor);
+		response.major, response.minor);
 
 	return 0;
 }

drivers/staging/greybus/protocol.h

@@ -44,10 +44,8 @@ int gb_protocol_deregister(struct gb_protocol *protocol);
 	__gb_protocol_register(protocol, THIS_MODULE)
 
 struct gb_protocol *gb_protocol_get(u8 id, u8 major, u8 minor);
-int gb_protocol_get_version(struct gb_connection *connection, int type,
-			    void *request, int request_size,
-			    struct gb_protocol_version_response *response,
-			    __u8 major);
+int gb_protocol_get_version(struct gb_connection *connection, void *request,
+			    int request_size);
 
 void gb_protocol_put(struct gb_protocol *protocol);
 
@@ -107,27 +105,4 @@ void gb_##__protocol##_exit(void)			\
 	gb_protocol_deregister(&__protocol);		\
 }							\
 
-/*
- * Macro to create get_version() routine for protocols
- * @__device: name of the device struct
- * @__protocol: name of protocol in CAPITALS
- */
-#define define_get_version(__device, __protocol)	\
-static int get_version(struct __device *dev)		\
-{							\
-	struct gb_protocol_version_response response;	\
-	int retval;					\
-							\
-	retval = gb_protocol_get_version(dev->connection,		\
-				GB_##__protocol##_TYPE_PROTOCOL_VERSION,\
-				NULL, 0, &response,			\
-				GB_##__protocol##_VERSION_MAJOR);	\
-	if (retval)					\
-		return retval;				\
-							\
-	dev->version_major = response.major;		\
-	dev->version_minor = response.minor;		\
-	return 0;					\
-}
-
 #endif /* __PROTOCOL_H */

drivers/staging/greybus/pwm.c

@@ -16,8 +16,6 @@
 
 struct gb_pwm_chip {
 	struct gb_connection	*connection;
-	u8			version_major;
-	u8			version_minor;
 	u8			pwm_max;	/* max pwm number */
 
 	struct pwm_chip		chip;
@@ -27,9 +25,6 @@ struct gb_pwm_chip {
 	container_of(chip, struct gb_pwm_chip, chip)
 
 
-/* Define get_version() routine */
-define_get_version(gb_pwm_chip, PWM);
-
 static int gb_pwm_count_operation(struct gb_pwm_chip *pwmc)
 {
 	struct gb_pwm_count_response response;
@@ -194,11 +189,6 @@ static int gb_pwm_connection_init(struct gb_connection *connection)
 	pwmc->connection = connection;
 	connection->private = pwmc;
 
-	/* Check for compatible protocol version */
-	ret = get_version(pwmc);
-	if (ret)
-		goto out_err;
-
 	/* Query number of pwms present */
 	ret = gb_pwm_count_operation(pwmc);
 	if (ret)
@@ -239,8 +229,8 @@ static void gb_pwm_connection_exit(struct gb_connection *connection)
 static struct gb_protocol pwm_protocol = {
 	.name			= "pwm",
 	.id			= GREYBUS_PROTOCOL_PWM,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_PWM_VERSION_MAJOR,
+	.minor			= GB_PWM_VERSION_MINOR,
 	.connection_init	= gb_pwm_connection_init,
 	.connection_exit	= gb_pwm_connection_exit,
 	.request_recv		= NULL, /* no incoming requests */

drivers/staging/greybus/raw.c

@@ -19,8 +19,6 @@
 
 struct gb_raw {
 	struct gb_connection *connection;
-	u8 version_major;
-	u8 version_minor;
 
 	struct list_head list;
 	int list_data;
@@ -35,13 +33,8 @@ struct gb_raw {
 #define	GB_RAW_VERSION_MINOR			0x01
 
 /* Greybus raw request types */
-#define	GB_RAW_TYPE_INVALID			0x00
-#define	GB_RAW_TYPE_PROTOCOL_VERSION		0x01
 #define	GB_RAW_TYPE_SEND			0x02
 
-/* Define get_version() routine */
-define_get_version(gb_raw, RAW);
-
 struct gb_raw_send_request {
 	__le32	len;
 	__u8	data[0];
@@ -180,11 +173,6 @@ static int gb_raw_connection_init(struct gb_connection *connection)
 	raw->connection = connection;
 	connection->private = raw;
 
-	/* Check the protocol version */
-	retval = get_version(raw);
-	if (retval)
-		goto error_free;
-
 	INIT_LIST_HEAD(&raw->list);
 	mutex_init(&raw->list_lock);
 

drivers/staging/greybus/sdio.c

@@ -18,8 +18,6 @@
 
 struct gb_sdio_host {
 	struct gb_connection	*connection;
-	u8			version_major;
-	u8			version_minor;
 	struct mmc_host		*mmc;
 	struct mmc_request	*mrq;
 	struct mutex		lock;	/* lock for this host */
@@ -36,9 +34,6 @@ struct gb_sdio_host {
 
 static struct workqueue_struct *gb_sdio_mrq_workqueue;
 
-/* Define get_version() routine */
-define_get_version(gb_sdio_host, SDIO);
-
 #define GB_SDIO_RSP_R1_R5_R6_R7	(GB_SDIO_RSP_PRESENT | GB_SDIO_RSP_CRC | \
 				 GB_SDIO_RSP_OPCODE)
 #define GB_SDIO_RSP_R3_R4	(GB_SDIO_RSP_PRESENT)
@@ -192,8 +187,9 @@ static int gb_sdio_event_recv(u8 type, struct gb_operation *op)
 
 	request = op->request;
 
-	if (request->payload_size != sizeof(*payload)) {
-		dev_err(mmc_dev(host->mmc), "wrong event size received\n");
+	if (request->payload_size < sizeof(*payload)) {
+		dev_err(mmc_dev(host->mmc), "wrong event size received (%zu < %zu)\n",
+			request->payload_size, sizeof(*payload));
 		return -EINVAL;
 	}
 
@@ -694,10 +690,6 @@ static int gb_sdio_connection_init(struct gb_connection *connection)
 	host->connection = connection;
 	connection->private = host;
 
-	ret = get_version(host);
-	if (ret < 0)
-		goto free_mmc;
-
 	ret = gb_sdio_get_caps(host);
 	if (ret < 0)
 		goto free_mmc;

drivers/staging/greybus/spi.c

@@ -17,8 +17,6 @@
 
 struct gb_spi {
 	struct gb_connection	*connection;
-	u8			version_major;
-	u8			version_minor;
 
 	/* Modes supported by spi controller */
 	u16			mode;
@@ -181,9 +179,6 @@ static void gb_spi_cleanup(struct spi_device *spi)
 
 /* Routines to get controller infomation */
 
-/* Define get_version() routine */
-define_get_version(gb_spi, SPI);
-
 /*
  * Map Greybus spi mode bits/flags/bpw into Linux ones.
  * All bits are same for now and so these macro's return same values.
@@ -264,11 +259,6 @@ static int gb_spi_init(struct gb_spi *spi)
 {
 	int ret;
 
-	/* First thing we need to do is check the version */
-	ret = get_version(spi);
-	if (ret)
-		return ret;
-
 	/* mode never changes, just get it once */
 	ret = gb_spi_mode_operation(spi);
 	if (ret)
@@ -340,8 +330,8 @@ static void gb_spi_connection_exit(struct gb_connection *connection)
 static struct gb_protocol spi_protocol = {
 	.name			= "spi",
 	.id			= GREYBUS_PROTOCOL_SPI,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_SPI_VERSION_MAJOR,
+	.minor			= GB_SPI_VERSION_MINOR,
 	.connection_init	= gb_spi_connection_init,
 	.connection_exit	= gb_spi_connection_exit,
 	.request_recv		= NULL,

drivers/staging/greybus/svc.c

@@ -16,8 +16,6 @@
 
 struct gb_svc {
 	struct gb_connection	*connection;
-	u8			version_major;
-	u8			version_minor;
 };
 
 struct svc_hotplug {
@@ -201,6 +199,9 @@ static int gb_svc_version_request(struct gb_operation *op)
 		return -ENOTSUPP;
 	}
 
+	connection->module_major = version->major;
+	connection->module_minor = version->minor;
+
 	if (!gb_operation_response_alloc(op, sizeof(*version), GFP_KERNEL)) {
 		dev_err(dev, "%s: error allocating response\n",
 				__func__);
@@ -231,8 +232,8 @@ static int gb_svc_hello(struct gb_operation *op)
 	 * SVC sends information about the endo and interface-id on the hello
 	 * request, use that to create an endo.
 	 */
-	if (op->request->payload_size != sizeof(*hello_request)) {
-		dev_err(dev, "%s: Illegal size of hello request (%zu %zu)\n",
+	if (op->request->payload_size < sizeof(*hello_request)) {
+		dev_err(dev, "%s: Illegal size of hello request (%zu < %zu)\n",
 			__func__, op->request->payload_size,
 			sizeof(*hello_request));
 		return -EINVAL;
@@ -290,7 +291,6 @@ static void svc_process_hotplug(struct work_struct *work)
 	ara_vend_id = le32_to_cpu(hotplug->data.ara_vend_id);
 	ara_prod_id = le32_to_cpu(hotplug->data.ara_prod_id);
 
-	// FIXME May require firmware download
 	intf = gb_interface_create(hd, intf_id);
 	if (!intf) {
 		dev_err(dev, "%s: Failed to create interface with id %hhu\n",

drivers/staging/greybus/uart.c

@@ -55,8 +55,6 @@ struct gb_tty {
 	struct async_icount oldcount;
 	wait_queue_head_t wioctl;
 	struct mutex mutex;
-	u8 version_major;
-	u8 version_minor;
 	u8 ctrlin;	/* input control lines */
 	u8 ctrlout;	/* output control lines */
 	struct gb_tty_line_coding line_coding;
@@ -67,9 +65,6 @@ static DEFINE_IDR(tty_minors);
 static DEFINE_MUTEX(table_lock);
 static atomic_t reference_count = ATOMIC_INIT(0);
 
-/* Define get_version() routine */
-define_get_version(gb_tty, UART);
-
 static int gb_uart_receive_data(struct gb_tty *gb_tty,
 				struct gb_connection *connection,
 				struct gb_uart_recv_data_request *receive_data)
@@ -628,21 +623,16 @@ static int gb_uart_connection_init(struct gb_connection *connection)
 	gb_tty->connection = connection;
 	connection->private = gb_tty;
 
-	/* Check for compatible protocol version */
-	retval = get_version(gb_tty);
-	if (retval)
-		goto error_version;
-
 	minor = alloc_minor(gb_tty);
 	if (minor < 0) {
 		if (minor == -ENOSPC) {
 			dev_err(&connection->dev,
 				"no more free minor numbers\n");
 			retval = -ENODEV;
-			goto error_version;
+			goto error_minor;
 		}
 		retval = minor;
-		goto error_version;
+		goto error_minor;
 	}
 
 	gb_tty->minor = minor;
@@ -674,7 +664,7 @@ static int gb_uart_connection_init(struct gb_connection *connection)
 error:
 	tty_port_destroy(&gb_tty->port);
 	release_minor(gb_tty);
-error_version:
+error_minor:
 	connection->private = NULL;
 	kfree(gb_tty->buffer);
 error_payload:
@@ -767,8 +757,8 @@ static void gb_tty_exit(void)
 static struct gb_protocol uart_protocol = {
 	.name			= "uart",
 	.id			= GREYBUS_PROTOCOL_UART,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_UART_VERSION_MAJOR,
+	.minor			= GB_UART_VERSION_MINOR,
 	.connection_init	= gb_uart_connection_init,
 	.connection_exit	= gb_uart_connection_exit,
 	.request_recv		= gb_uart_request_recv,

drivers/staging/greybus/usb.c

@@ -20,8 +20,6 @@
 #define GB_USB_VERSION_MINOR		0x01
 
 /* Greybus USB request types */
-#define GB_USB_TYPE_INVALID		0x00
-#define GB_USB_TYPE_PROTOCOL_VERSION	0x01
 #define GB_USB_TYPE_HCD_START		0x02
 #define GB_USB_TYPE_HCD_STOP		0x03
 #define GB_USB_TYPE_HUB_CONTROL		0x04
@@ -39,9 +37,6 @@ struct gb_usb_hub_control_response {
 
 struct gb_usb_device {
 	struct gb_connection *connection;
-
-	u8 version_major;
-	u8 version_minor;
 };
 
 static inline struct gb_usb_device *to_gb_usb_device(struct usb_hcd *hcd)
@@ -54,9 +49,6 @@ static inline struct usb_hcd *gb_usb_device_to_hcd(struct gb_usb_device *dev)
 	return container_of((void *)dev, struct usb_hcd, hcd_priv);
 }
 
-/* Define get_version() routine */
-define_get_version(gb_usb_device, USB);
-
 static void hcd_stop(struct usb_hcd *hcd)
 {
 	struct gb_usb_device *dev = to_gb_usb_device(hcd);
@@ -183,11 +175,6 @@ static int gb_usb_connection_init(struct gb_connection *connection)
 	gb_usb_dev->connection = connection;
 	connection->private = gb_usb_dev;
 
-	/* Check for compatible protocol version */
-	retval = get_version(gb_usb_dev);
-	if (retval)
-		goto err_put_hcd;
-
 	hcd->has_tt = 1;
 
 	/*
@@ -226,8 +213,8 @@ static void gb_usb_connection_exit(struct gb_connection *connection)
 static struct gb_protocol usb_protocol = {
 	.name			= "usb",
 	.id			= GREYBUS_PROTOCOL_USB,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_USB_VERSION_MAJOR,
+	.minor			= GB_USB_VERSION_MINOR,
 	.connection_init	= gb_usb_connection_init,
 	.connection_exit	= gb_usb_connection_exit,
 	.request_recv		= NULL,	/* FIXME we have requests!!! */

drivers/staging/greybus/vibrator.c

@@ -19,8 +19,6 @@ struct gb_vibrator_device {
 	struct gb_connection	*connection;
 	struct device		*dev;
 	int			minor;		/* vibrator minor number */
-	u8			version_major;
-	u8			version_minor;
 };
 
 /* Version of the Greybus vibrator protocol we support */
@@ -28,8 +26,6 @@ struct gb_vibrator_device {
 #define	GB_VIBRATOR_VERSION_MINOR		0x01
 
 /* Greybus Vibrator operation types */
-#define	GB_VIBRATOR_TYPE_INVALID		0x00
-#define	GB_VIBRATOR_TYPE_PROTOCOL_VERSION	0x01
 #define	GB_VIBRATOR_TYPE_ON			0x02
 #define	GB_VIBRATOR_TYPE_OFF			0x03
 
@@ -37,9 +33,6 @@ struct gb_vibrator_on_request {
 	__le16	timeout_ms;
 };
 
-/* Define get_version() routine */
-define_get_version(gb_vibrator_device, VIBRATOR);
-
 static int turn_on(struct gb_vibrator_device *vib, u16 timeout_ms)
 {
 	struct gb_vibrator_on_request request;
@@ -108,10 +101,6 @@ static int gb_vibrator_connection_init(struct gb_connection *connection)
 	vib->connection = connection;
 	connection->private = vib;
 
-	retval = get_version(vib);
-	if (retval)
-		goto error;
-
 	/*
 	 * For now we create a device in sysfs for the vibrator, but odds are
 	 * there is a "real" device somewhere in the kernel for this, but I
@@ -167,8 +156,8 @@ static void gb_vibrator_connection_exit(struct gb_connection *connection)
 static struct gb_protocol vibrator_protocol = {
 	.name			= "vibrator",
 	.id			= GREYBUS_PROTOCOL_VIBRATOR,
-	.major			= 0,
-	.minor			= 1,
+	.major			= GB_VIBRATOR_VERSION_MAJOR,
+	.minor			= GB_VIBRATOR_VERSION_MINOR,
 	.connection_init	= gb_vibrator_connection_init,
 	.connection_exit	= gb_vibrator_connection_exit,
 	.request_recv		= NULL,	/* no incoming requests */