Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b710ec0 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman
Browse files

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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 35e28794

drivers/staging/greybus/audio_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/greybus/greybus_manifest.h

+2 −2
Original line number Diff line number Diff line
@@ -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,

		/* ... */