From patchwork Sun Jul 23 21:57:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 13323367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DBBBC001DC for ; Sun, 23 Jul 2023 21:58:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229974AbjGWV6P (ORCPT ); Sun, 23 Jul 2023 17:58:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229945AbjGWV6O (ORCPT ); Sun, 23 Jul 2023 17:58:14 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C557DE68; Sun, 23 Jul 2023 14:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=IYAlUHXkzs4yHGq9o8cV2GDjIUpEiwbm5rCfp1MO9CY=; b=H7pT1KY2nNjOJxm+3FLxBoZTuq M4unC/y5wJ79+7lp/MAakzdv9FgQUejejwmYMwKsqOQdN51fhz3G5a9kIdkV/rMAK6ME3tg9YDj6W U1cePP4udbvYqfoHwVbh2aqRQWbmWZqBnMzZ1+0gmcfnmZlghz4LnbXVyFhRZHQb1XIZokcVmiFPn IfTw5Wup2MsHZEeSIdSwn/zZRWAM2PU5M9xkqAO+pd/YBgs7VfQc2xF4voF4U9lVMWI4UIcmSWgS6 SbECgD+Jx30OLJoMtth4vj3M7y5JJFppm8ZxAZ6YXGWVcGG1JWOXGfWKETrRkMco7Vh4cUeaIs0hO MXApPjCQ==; Received: from [2601:1c2:980:9ec0::2764] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qNh5U-001xyd-1P; Sun, 23 Jul 2023 21:58:00 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , kernel test robot , Richard Weinberger , Anton Ivanov , Johannes Berg , linux-um@lists.infradead.org, Tejun Heo , Takashi Iwai , Jaroslav Kysela , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kbuild@vger.kernel.org Subject: [PATCH v2] um/drivers: Kconfig: fix hostaudio build errors Date: Sun, 23 Jul 2023 14:57:56 -0700 Message-ID: <20230723215756.18307-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Use "select"s to ensure that the required kconfig symbols are set as expected. This fixes build errors when CONFIG_SOUND is not set. ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_cleanup_module': hostaudio_kern.c:(.exit.text+0xa): undefined reference to `unregister_sound_mixer' ld: hostaudio_kern.c:(.exit.text+0x15): undefined reference to `unregister_sound_dsp' ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_init_module': hostaudio_kern.c:(.init.text+0x19): undefined reference to `register_sound_dsp' ld: hostaudio_kern.c:(.init.text+0x31): undefined reference to `register_sound_mixer' ld: hostaudio_kern.c:(.init.text+0x49): undefined reference to `unregister_sound_dsp' Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Fixes: d886e87cb82b ("sound: make OSS sound core optional") Signed-off-by: Randy Dunlap Reported-by: kernel test robot Link: lore.kernel.org/r/202307141416.vxuRVpFv-lkp@intel.com Cc: Richard Weinberger Cc: Anton Ivanov Cc: Johannes Berg Cc: linux-um@lists.infradead.org Cc: Tejun Heo Cc: Takashi Iwai Cc: Jaroslav Kysela Cc: Masahiro Yamada Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Nicolas Schier Cc: linux-kbuild@vger.kernel.org --- v2: don't delete the HOSTAUDIO Kconfig entry (Masahiro) arch/um/drivers/Kconfig | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff -- a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig --- a/arch/um/drivers/Kconfig +++ b/arch/um/drivers/Kconfig @@ -111,20 +111,14 @@ config SSL_CHAN config UML_SOUND tristate "Sound support" + select SOUND + select SOUND_OSS_CORE help This option enables UML sound support. If enabled, it will pull in soundcore and the UML hostaudio relay, which acts as a intermediary between the host's dsp and mixer devices and the UML sound system. It is safe to say 'Y' here. -config SOUND - tristate - default UML_SOUND - -config SOUND_OSS_CORE - bool - default UML_SOUND - config HOSTAUDIO tristate default UML_SOUND