[RFC 01/15] ALSA: usb: Move media-filters to the media code

[Cezary Rojewski <cezary.rojewski@intel.com>]

Creating and deleting process of media devices in the common code can
be simplified if quirk_flags are checked in callee.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/usb/card.c  | 13 +++----------
 sound/usb/media.c |  6 ++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 9c411b82a218..03694295491f 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -909,10 +909,8 @@ static int usb_audio_probe(struct usb_interface *intf,
 	if (err < 0)
 		goto __error_no_register;
 
-	if (chip->quirk_flags & QUIRK_FLAG_SHARE_MEDIA_DEVICE) {
-		/* don't want to fail when snd_media_device_create() fails */
-		snd_media_device_create(chip, intf);
-	}
+	/* don't want to fail when snd_media_device_create() fails */
+	snd_media_device_create(chip, intf);
 
 	if (quirk)
 		chip->quirk_type = quirk->type;
@@ -983,12 +981,7 @@ static void usb_audio_disconnect(struct usb_interface *intf)
 			snd_usbmidi_disconnect(p);
 		}
 		snd_usb_midi_v2_disconnect_all(chip);
-		/*
-		 * Nice to check quirk && quirk->shares_media_device and
-		 * then call the snd_media_device_delete(). Don't have
-		 * access to the quirk here. snd_media_device_delete()
-		 * accesses mixer_list
-		 */
+		 /* snd_media_device_delete() accesses mixer_list */
 		snd_media_device_delete(chip);
 
 		/* release mixer resources */
diff --git a/sound/usb/media.c b/sound/usb/media.c
index d48db6f3ae65..b175fa820345 100644
--- a/sound/usb/media.c
+++ b/sound/usb/media.c
@@ -258,6 +258,9 @@ int snd_media_device_create(struct snd_usb_audio *chip,
 	struct usb_device *usbdev = interface_to_usbdev(iface);
 	int ret = 0;
 
+	if (!(chip->quirk_flags & QUIRK_FLAG_SHARE_MEDIA_DEVICE))
+		return 0;
+
 	/* usb-audio driver is probed for each usb interface, and
 	 * there are multiple interfaces per device. Avoid calling
 	 * media_device_usb_allocate() each time usb_audio_probe()
@@ -312,6 +315,9 @@ void snd_media_device_delete(struct snd_usb_audio *chip)
 	struct media_device *mdev = chip->media_dev;
 	struct snd_usb_stream *stream;
 
+	if (!(chip->quirk_flags & QUIRK_FLAG_SHARE_MEDIA_DEVICE))
+		return;
+
 	/* release resources */
 	list_for_each_entry(stream, &chip->pcm_list, list) {
 		snd_media_stream_delete(&stream->substream[0]);
-- 
2.25.1