50e7a31d - media: Fix Media Controller API config checks

Wed, 16 Jun 2021 15:19:06 +0000

media: Fix Media Controller API config checksSmatch static checker warns that "mdev" can be null:sound/usb/media.c:287 snd_media_device_create() warn: 'mdev' can also be NULLIf CONFIG_MEDIA_CONTROLLER is disabled, this file should not be includedin the build.The below conditions in the sound/usb/Makefile are in place to ensure thatmedia.c isn't included in the build.sound/usb/Makefile:snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.oselect SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND_USB_AUDIO)The following config check in include/media/media-dev-allocator.h isin place to enable the API only when CONFIG_MEDIA_CONTROLLER andCONFIG_USB are enabled. #if defined(CONFIG_MEDIA_CONTROLLER) && defined(CONFIG_USB)This check doesn't work as intended when CONFIG_USB=m. When CONFIG_USB=m,CONFIG_USB_MODULE is defined and CONFIG_USB is not. The above config checkdoesn't catch that CONFIG_USB is defined as a module and disables the API.This results in sound/usb enabling Media Controller specific ALSA drivercode, while Media disables the Media Controller API.Fix the problem requires two changes:1. Change the check to use IS_ENABLED to detect when CONFIG_USB is enabled as a module or static. Since CONFIG_MEDIA_CONTROLLER is a bool, leave the check unchanged to be consistent with drivers/media/Makefile.2. Change the drivers/media/mc/Makefile to include mc-dev-allocator.o in mc-objs when CONFIG_USB is enabled.Link: https://lore.kernel.org/alsa-devel/YLeAvT+R22FQ%2FEyw@mwanda/Reported-by: Dan Carpenter Signed-off-by: Shuah Khan Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab List of files: /linux-6.15/drivers/media/mc/Makefile

c612e54f - media: move drivers/media/media-* to drivers/media/mc/mc-*

Thu, 02 May 2019 13:42:31 +0000

media: move drivers/media/media-* to drivers/media/mc/mc-*It is really weird that the media controller sources are all top-levelin drivers/media. It is a bit of a left-over from long ago when mostmedia sources were all at the top-level. At some point we reorganizedthe directory structure, but the media-*.c sources where never movedto their own directory.So create a new mc directory and move all sources there. Also renamethe prefix from media- to mc-.Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab List of files: /linux-6.15/drivers/media/mc/Makefile

Changes in Makefile

50e7a31d - media: Fix Media Controller API config checks

c612e54f - media: move drivers/media/media-* to drivers/media/mc/mc-*