OSDN Git Service

greybus: vibrator: Drop get_version support
authorViresh Kumar <viresh.kumar@linaro.org>
Tue, 11 Aug 2015 02:06:13 +0000 (07:36 +0530)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 12 Aug 2015 02:33:05 +0000 (19:33 -0700)
This is done from a common place now, no need to replicate it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/vibrator.c

index df9c4b1..96d649a 100644 (file)
@@ -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