1
0
Fork 0

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>
hifive-unleashed-5.1
Viresh Kumar 2016-01-27 11:17:00 +05:30 committed by Greg Kroah-Hartman
parent 35e28794dc
commit 3b710ec06e
2 changed files with 3 additions and 3 deletions

View File

@ -1024,7 +1024,7 @@ static void gb_audio_disconnect(struct gb_bundle *bundle)
} }
static const struct greybus_bundle_id gb_audio_id_table[] = { 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); MODULE_DEVICE_TABLE(greybus, gb_audio_id_table);

View File

@ -69,8 +69,8 @@ enum greybus_class_type {
GREYBUS_CLASS_LIGHTS = 0x0f, GREYBUS_CLASS_LIGHTS = 0x0f,
GREYBUS_CLASS_VIBRATOR = 0x10, GREYBUS_CLASS_VIBRATOR = 0x10,
GREYBUS_CLASS_LOOPBACK = 0x11, GREYBUS_CLASS_LOOPBACK = 0x11,
GREYBUS_CLASS_AUDIO_MGMT = 0x12, GREYBUS_CLASS_AUDIO = 0x12,
GREYBUS_CLASS_AUDIO_DATA = 0x13, /* 0x13 is unused */
GREYBUS_CLASS_SVC = 0x14, GREYBUS_CLASS_SVC = 0x14,
GREYBUS_CLASS_FIRMWARE = 0x15, GREYBUS_CLASS_FIRMWARE = 0x15,
/* ... */ /* ... */