Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2238236iof; Wed, 8 Jun 2022 00:07:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXZ4Y+PeTaUwfS1FHWvcALqStwyvnR/+13xFePEOCI8UD0EibAZBltnAMpVOTBmv8I/GsM X-Received: by 2002:a63:e1c:0:b0:3fd:f319:df7b with SMTP id d28-20020a630e1c000000b003fdf319df7bmr7629490pgl.135.1654672064801; Wed, 08 Jun 2022 00:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654672064; cv=none; d=google.com; s=arc-20160816; b=IJYEnnZGHUrrH0Go/3DGMC63Rk9/yVjfjvr3zPZbYJRqSP4SaM3AAP9lwG5ZW4RT0g B/JKkswZSJ1MVB8K6V9XLeojKUode02jvJuPFYeXHZqh8pJuH0gL27pf8Vhr2lTlri8X XMrGfOFhqTbQsmiOd94u/Di3elytJf0oLIHYFLLukgo3bfPBFEJ0cNKwzx/0RrVeIYjk gRLeOi4hmqKvyTyDmVWCcJx4CnJTdaLxustITBNuTILO57IlHriyapphuAvOVh+cgtXC j/Jzu5Q3JCw81hiSsfVJFEo5vjdIa5S6xiCEaYix+amBzkzZM/cvoAXP3xU7hT9t82c0 BtxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rUsz7gVyISfljzJdPRdQ3uzwHrK/Q8sA3N3FuKSmsxA=; b=StvP+NYD/EYfQeGlW8hPyNROCMwHJqmiethaK+xIeYjQ1ndKW9poNHgoKTBZdp5dLB OqU63fHjM5QhRaPUtYNDfHalX1dvhNQoXj6uAd6MyjKmdpwthXI8G0Ti1By/xYtBZzUq iCg9AaUwlyTjSK1sjPtcDPGKAix4ApyJLGaN2plj5sD16/xL8a1LINGuz4xqS1oG0QsD oOArBsfR/ru8qYoCEBRpu9PABDYzpjlW55i0BeCavFa0XTVV3/QMUtKmc8/pK558LHlL UabpRTAOd4393903SamzmUE5nG8BwRlBFkL4yfc1DPVDtcse7WH2iyeXd9q1yPQpdrpH ecJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zEI4SX8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w69-20020a638248000000b003fe34775ab6si1473624pgd.286.2022.06.08.00.07.32; Wed, 08 Jun 2022 00:07:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zEI4SX8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1386274AbiFGWso (ORCPT + 99 others); Tue, 7 Jun 2022 18:48:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381283AbiFGVkY (ORCPT ); Tue, 7 Jun 2022 17:40:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C101826558; Tue, 7 Jun 2022 12:06:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5B30D617DA; Tue, 7 Jun 2022 19:06:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BC3CC385A2; Tue, 7 Jun 2022 19:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654628766; bh=q41phyPIPeloQ6si3/G89TZ9tn96bErSYBQJUnEKDZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zEI4SX8gci3zKW/N8O+UpsengUMnExeiuCLCtLKv1fYh1uq3q6V1BTOOsopQipeFt 1Z4Czv6PD1Y0tHcb7YO9nNRnjQCUERUEMSR+Z9RtBVfMx9ZP8Jy7I7Jx3b7CKJrnY3 0QcOtD42VBESDxX2qDvQpt0HbcTOkPopet5FKygM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , kernel test robot , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.18 447/879] media: make RADIO_ADAPTERS tristate Date: Tue, 7 Jun 2022 18:59:25 +0200 Message-Id: <20220607165015.845592042@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit 215d49a41709610b9e82a49b27269cfaff1ef0b6 ] Fix build errors when RADIO_TEA575X=y, VIDEO_BT848=m, and VIDEO_DEV=m. The build errors occur due to [in drivers/media/Makefile]: obj-$(CONFIG_VIDEO_DEV) += radio/ so the (would be) builtin tea575x.o is not being built. This is also due to drivers/media/radio/Kconfig declaring a bool Kconfig symbol (RADIO_ADAPTERS) that depends on a tristate (VIDEO_DEV), so when VIDEO_DEV=m, RADIO_ADAPTERS becomes =y, and then the drivers that depend on RADIO_ADPATERS can be configured as builtin (=y) or as loadable modules (=m). Fix this by converting RADIO_ADAPTERS to a tristate symbol instead of a bool symbol. Fixes these build errors: ERROR: modpost: "snd_tea575x_hw_init" [drivers/media/pci/bt8xx/bttv.ko] undefined! ERROR: modpost: "snd_tea575x_set_freq" [drivers/media/pci/bt8xx/bttv.ko] undefined! ERROR: modpost: "snd_tea575x_s_hw_freq_seek" [drivers/media/pci/bt8xx/bttv.ko] undefined! ERROR: modpost: "snd_tea575x_enum_freq_bands" [drivers/media/pci/bt8xx/bttv.ko] undefined! ERROR: modpost: "snd_tea575x_g_tuner" [drivers/media/pci/bt8xx/bttv.ko] undefined! Link: lore.kernel.org/r/202204191711.IKJJFjgU-lkp@intel.com Fixes: 9958d30f38b9 ("media: Kconfig: cleanup VIDEO_DEV dependencies") Signed-off-by: Randy Dunlap Reported-by: kernel test robot Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/radio/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index cca03bd2cc42..616a38feb641 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -4,10 +4,10 @@ # menuconfig RADIO_ADAPTERS - bool "Radio Adapters" + tristate "Radio Adapters" depends on VIDEO_DEV depends on MEDIA_RADIO_SUPPORT - default y + default VIDEO_DEV help Say Y here to enable selecting AM/FM radio adapters. -- 2.35.1