From 3b710ec06e00ce041606678b25f9c82e95fde813 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Wed, 27 Jan 2016 11:17:00 +0530 Subject: [PATCH] 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 Reviewed-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/audio_codec.c | 2 +- drivers/staging/greybus/greybus_manifest.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c index b2feba8..b43b543 100644 --- 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 32602b1..76649a6 100644 --- 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, /* ... */ -- 2.7.4