From 0decdd55b38ac8276a1039654e529120f65ee366 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Thu, 5 May 2016 08:49:58 +0530 Subject: [PATCH] greybus: Revert "interface: Fetch and expose version of interface's firmware" This reverts commit b957ade7b3e4ab8c149c53346dbf02e977b7f3a7. The interface version is now managed as part of the firmware-management protocol. This operation is already removed from the greybus specifications. Drop interface version support from greybus. Tested with gbsim (sysfs file not available after this patch). Signed-off-by: Viresh Kumar Reviewed-by: Johan Hovold Acked-by: Sandeep Patil Signed-off-by: Greg Kroah-Hartman --- .../greybus/Documentation/sysfs-bus-greybus | 8 ------ drivers/staging/greybus/control.c | 28 ------------------- drivers/staging/greybus/control.h | 1 - drivers/staging/greybus/greybus_protocols.h | 8 +----- drivers/staging/greybus/interface.c | 15 ---------- drivers/staging/greybus/interface.h | 3 -- 6 files changed, 1 insertion(+), 62 deletions(-) diff --git a/drivers/staging/greybus/Documentation/sysfs-bus-greybus b/drivers/staging/greybus/Documentation/sysfs-bus-greybus index 0e1c2a37b24f..3740173e3cd0 100644 --- a/drivers/staging/greybus/Documentation/sysfs-bus-greybus +++ b/drivers/staging/greybus/Documentation/sysfs-bus-greybus @@ -111,14 +111,6 @@ Contact: Greg Kroah-Hartman Description: Vendor ID of a Greybus interface. -What: /sys/bus/greybus/devices/N-M.I/version -Date: October 2015 -KernelVersion: 4.XX -Contact: Greg Kroah-Hartman -Description: - Interface version represented as <16 bit major number>.<16 bit - minor number>. - What: /sys/bus/greybus/devices/N-M.I/voltage_now Date: March 2016 KernelVersion: 4.XX diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c index 1b28899cd336..13c68f3f01de 100644 --- a/drivers/staging/greybus/control.c +++ b/drivers/staging/greybus/control.c @@ -156,34 +156,6 @@ int gb_control_mode_switch_operation(struct gb_control *control) NULL, 0); } -int gb_control_get_interface_version_operation(struct gb_interface *intf) -{ - struct gb_control_interface_version_response response; - struct gb_connection *connection = intf->control->connection; - int ret; - - if (intf->quirks & GB_INTERFACE_QUIRK_NO_INTERFACE_VERSION) - return 0; - - ret = gb_operation_sync(connection, GB_CONTROL_TYPE_INTERFACE_VERSION, - NULL, 0, &response, sizeof(response)); - if (ret) { - dev_err(&connection->intf->dev, - "failed to get interface version: %d\n", ret); - /* - * FIXME: Return success until the time we bump version of - * control protocol. The interface-version is already set to - * 0.0, so no need to update that. - */ - return 0; - } - - intf->version_major = le16_to_cpu(response.major); - intf->version_minor = le16_to_cpu(response.minor); - - return 0; -} - int gb_control_timesync_enable(struct gb_control *control, u8 count, u64 frame_time, u32 strobe_delay, u32 refclk) { diff --git a/drivers/staging/greybus/control.h b/drivers/staging/greybus/control.h index f108bcc2e059..773cdde4dc44 100644 --- a/drivers/staging/greybus/control.h +++ b/drivers/staging/greybus/control.h @@ -40,7 +40,6 @@ int gb_control_mode_switch_operation(struct gb_control *control); int gb_control_get_manifest_size_operation(struct gb_interface *intf); int gb_control_get_manifest_operation(struct gb_interface *intf, void *manifest, size_t size); -int gb_control_get_interface_version_operation(struct gb_interface *intf); int gb_control_timesync_enable(struct gb_control *control, u8 count, u64 frame_time, u32 strobe_delay, u32 refclk); int gb_control_timesync_disable(struct gb_control *control); diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h index b73acc0c3ee5..5f5b92864ac2 100644 --- a/drivers/staging/greybus/greybus_protocols.h +++ b/drivers/staging/greybus/greybus_protocols.h @@ -121,7 +121,7 @@ struct gb_protocol_version_response { #define GB_CONTROL_TYPE_TIMESYNC_ENABLE 0x07 #define GB_CONTROL_TYPE_TIMESYNC_DISABLE 0x08 #define GB_CONTROL_TYPE_TIMESYNC_AUTHORITATIVE 0x09 -#define GB_CONTROL_TYPE_INTERFACE_VERSION 0x0a +/* Unused 0x0a */ #define GB_CONTROL_TYPE_BUNDLE_VERSION 0x0b #define GB_CONTROL_TYPE_MODE_SWITCH 0x0e @@ -164,12 +164,6 @@ struct gb_control_disconnected_request { } __packed; /* Control protocol [dis]connected response has no payload */ -/* Control protocol interface version request has no payload */ -struct gb_control_interface_version_response { - __le16 major; - __le16 minor; -} __packed; - #define GB_TIMESYNC_MAX_STROBES 0x04 struct gb_control_timesync_enable_request { diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c index b5ad1ac9d3df..aed45bcef376 100644 --- a/drivers/staging/greybus/interface.c +++ b/drivers/staging/greybus/interface.c @@ -254,16 +254,6 @@ gb_interface_attr(vendor_id, "0x%08x"); gb_interface_attr(product_id, "0x%08x"); gb_interface_attr(serial_number, "0x%016llx"); -static ssize_t version_show(struct device *dev, struct device_attribute *attr, - char *buf) -{ - struct gb_interface *intf = to_gb_interface(dev); - - return scnprintf(buf, PAGE_SIZE, "%u.%u\n", intf->version_major, - intf->version_minor); -} -static DEVICE_ATTR_RO(version); - static ssize_t voltage_now_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -328,7 +318,6 @@ static struct attribute *interface_attrs[] = { &dev_attr_vendor_id.attr, &dev_attr_product_id.attr, &dev_attr_serial_number.attr, - &dev_attr_version.attr, &dev_attr_voltage_now.attr, &dev_attr_current_now.attr, &dev_attr_power_now.attr, @@ -621,10 +610,6 @@ int gb_interface_enable(struct gb_interface *intf) goto err_destroy_bundles; } - ret = gb_control_get_interface_version_operation(intf); - if (ret) - goto err_destroy_bundles; - ret = gb_control_get_bundle_versions(intf->control); if (ret) goto err_destroy_bundles; diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h index 7a0366d08e32..7a2162a89f05 100644 --- a/drivers/staging/greybus/interface.h +++ b/drivers/staging/greybus/interface.h @@ -31,9 +31,6 @@ struct gb_interface { u32 product_id; u64 serial_number; - u16 version_major; - u16 version_minor; - struct gb_host_device *hd; struct gb_module *module; -- 2.45.2