greybus: Remove unused VERSION specific macros

We don't use these anymore. Drop them.

Note that some macro's specific to bridged PHY devices aren't removed in
the patch, as gbsim will break otherwise. They will be removed
separately.

Compile tested.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index ff371c44cdf4563659c980d24918a15c18a543d7..6550f1744ed828d0f0cb8194a167e8c6bfb3174e 100644 (file)
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -407,10 +407,6 @@ struct gb_bootrom_get_vid_pid_response {
 
 /* Power Supply */
 
-/* Version of the Greybus power supply protocol we support */
-#define GB_POWER_SUPPLY_VERSION_MAJOR          0x00
-#define GB_POWER_SUPPLY_VERSION_MINOR          0x01
-
 /* Greybus power supply request types */
 #define GB_POWER_SUPPLY_TYPE_GET_SUPPLIES              0x02
 #define GB_POWER_SUPPLY_TYPE_GET_DESCRIPTION           0x03
@@ -572,10 +568,6 @@ struct gb_power_supply_event_request {
 
 /* HID */
 
-/* Version of the Greybus hid protocol we support */
-#define GB_HID_VERSION_MAJOR           0x00
-#define GB_HID_VERSION_MINOR           0x01
-
 /* Greybus HID operation types */
 #define GB_HID_TYPE_GET_DESC           0x02
 #define GB_HID_TYPE_GET_REPORT_DESC    0x03
@@ -1243,10 +1235,6 @@ struct gb_svc_intf_mailbox_event_request {
 
 /* RAW */
 
-/* Version of the Greybus raw protocol we support */
-#define        GB_RAW_VERSION_MAJOR                    0x00
-#define        GB_RAW_VERSION_MINOR                    0x01
-
 /* Greybus raw request types */
 #define        GB_RAW_TYPE_SEND                        0x02
 
@@ -1344,10 +1332,6 @@ struct gb_uart_serial_flush_request {
 
 /* Loopback */
 
-/* Version of the Greybus loopback protocol we support */
-#define GB_LOOPBACK_VERSION_MAJOR              0x00
-#define GB_LOOPBACK_VERSION_MINOR              0x01
-
 /* Greybus loopback request types */
 #define GB_LOOPBACK_TYPE_PING                  0x02
 #define GB_LOOPBACK_TYPE_TRANSFER              0x03
@@ -1532,9 +1516,6 @@ struct gb_sdio_event_request {
 
 /* Camera */
 
-#define GB_CAMERA_VERSION_MAJOR                        0x00
-#define GB_CAMERA_VERSION_MINOR                        0x01
-
 /* Greybus Camera request types */
 #define GB_CAMERA_TYPE_CAPABILITIES            0x02
 #define GB_CAMERA_TYPE_CONFIGURE_STREAMS       0x03
@@ -1608,9 +1589,6 @@ struct gb_camera_metadata_request {
 
 /* Lights */
 
-#define GB_LIGHTS_VERSION_MAJOR 0x00
-#define GB_LIGHTS_VERSION_MINOR 0x01
-
 /* Greybus Lights request types */
 #define GB_LIGHTS_TYPE_GET_LIGHTS              0x02
 #define GB_LIGHTS_TYPE_GET_LIGHT_CONFIG                0x03
@@ -1782,11 +1760,6 @@ struct gb_lights_get_flash_fault_response {
 
 /* Audio */
 
-/* Version of the Greybus audio protocol we support */
-#define GB_AUDIO_VERSION_MAJOR                 0x00
-#define GB_AUDIO_VERSION_MINOR                 0x01
-
-#define GB_AUDIO_TYPE_PROTOCOL_VERSION         0x01
 #define GB_AUDIO_TYPE_GET_TOPOLOGY_SIZE                0x02
 #define GB_AUDIO_TYPE_GET_TOPOLOGY             0x03
 #define GB_AUDIO_TYPE_GET_CONTROL              0x04

diff --git a/drivers/staging/greybus/usb.c b/drivers/staging/greybus/usb.c
index 7ed6a60c1d564455d1bd8a747d8b5685256365c8..e5ba34ac76430feb833de9cce75f80bf87e6cff3 100644 (file)
--- a/drivers/staging/greybus/usb.c
+++ b/drivers/staging/greybus/usb.c
@@ -16,10 +16,6 @@
 #include "greybus.h"
 #include "gbphy.h"
 
-/* Version of the Greybus USB protocol we support */
-#define GB_USB_VERSION_MAJOR           0x00
-#define GB_USB_VERSION_MINOR           0x01
-
 /* Greybus USB request types */
 #define GB_USB_TYPE_HCD_START          0x02
 #define GB_USB_TYPE_HCD_STOP           0x03

diff --git a/drivers/staging/greybus/vibrator.c b/drivers/staging/greybus/vibrator.c
index 5afcb2784a32643a8823dde0c50246e67060aee1..33b2bf9c16c847cb3ded996c515744cc3280ed09 100644 (file)
--- a/drivers/staging/greybus/vibrator.c
+++ b/drivers/staging/greybus/vibrator.c
@@ -21,10 +21,6 @@ struct gb_vibrator_device {
        int                     minor;          /* vibrator minor number */
 };
 
-/* Version of the Greybus vibrator protocol we support */
-#define        GB_VIBRATOR_VERSION_MAJOR               0x00
-#define        GB_VIBRATOR_VERSION_MINOR               0x01
-
 /* Greybus Vibrator operation types */
 #define        GB_VIBRATOR_TYPE_ON                     0x02
 #define        GB_VIBRATOR_TYPE_OFF                    0x03