greybus: audio: Rename Audio class and remove the unused one

There should be a single class macro for Audio and two protocol macros.
Rename class with value 0x12 as GREYBUS_CLASS_AUDIO and remove the other
unused class GREYBUS_CLASS_AUDIO_DATA.

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

diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index b2feba8cee14ed2f0a066440521bdd95934a5de6..b43b5432d7a6441efbb0295aa25b790b8bf42d31 100644 (file)
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -1024,7 +1024,7 @@ static void gb_audio_disconnect(struct gb_bundle *bundle)
 }
 
 static const struct greybus_bundle_id gb_audio_id_table[] = {
-       { GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_AUDIO_MGMT) },
+       { GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_AUDIO) },
        { }
 };
 MODULE_DEVICE_TABLE(greybus, gb_audio_id_table);

diff --git a/drivers/staging/greybus/greybus_manifest.h b/drivers/staging/greybus/greybus_manifest.h
index 32602b1951b8abf3107a3346a520ea2ad5cbfc43..76649a6495545b01b28346801d1b06785edb0d89 100644 (file)
--- a/drivers/staging/greybus/greybus_manifest.h
+++ b/drivers/staging/greybus/greybus_manifest.h
@@ -69,8 +69,8 @@ enum greybus_class_type {
        GREYBUS_CLASS_LIGHTS            = 0x0f,
        GREYBUS_CLASS_VIBRATOR          = 0x10,
        GREYBUS_CLASS_LOOPBACK          = 0x11,
-       GREYBUS_CLASS_AUDIO_MGMT        = 0x12,
-       GREYBUS_CLASS_AUDIO_DATA        = 0x13,
+       GREYBUS_CLASS_AUDIO             = 0x12,
+       /* 0x13 is unused */
        GREYBUS_CLASS_SVC               = 0x14,
        GREYBUS_CLASS_FIRMWARE          = 0x15,
                /* ... */