From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90F0DC4332B for ; Wed, 17 Mar 2021 20:17:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6EED664F57 for ; Wed, 17 Mar 2021 20:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233434AbhCQURN (ORCPT ); Wed, 17 Mar 2021 16:17:13 -0400 Received: from mail-bn8nam12on2049.outbound.protection.outlook.com ([40.107.237.49]:14690 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233348AbhCQUQ4 (ORCPT ); Wed, 17 Mar 2021 16:16:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=odvOusFEz7Sfw+5iuadFc/n8RR03fPOL+WbBHf76ENro7/5hqIN7N/B81k+rEflB29BBbyiOQ5x4Cpqi0RdOrUdv6PpsHXsoio9Zo6xn+GGHoWBd/J0dBy3dF1ejNzBwSQHiQZ/eFqQP23bWuXR7f0v129bp9gjGaTvjbu332s848/rWcBk3wrzvGglzDP7u3tfFMcuhNyp7TEk31X3zxzwHsTRo0PmYmCDPx/aVfkJprRJmblBaztMII3ccgmyoNIzovbCypfZdzfyP7o0s2FBrZ7AzKnlul5arp3WSzoVrt1DlrhO8HtxqKefZTzQRbsbtSQFspB3hFqHbdWGj4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3x41Rb2I6orly7EQDa5DfFOmjXOnn5NIBnDb4DBxO9A=; b=fqAeyz5PPXP+5xg21+O4UPhqgM8hYjrKATVWUv4kN2lOfBKZJdaL9/IMfyZQk1p4BlKBCvldjHmF1pbwbVGU07RxZJWNI0SOXt5Gol5JH89/2yv77XqEiOVkqXjpJc9cV4QVSUgmoTLLR8UHhd/DGLhiDuQsFv9HCjm+6JU6a3B9hRzQgXm1X48J7Jampdl2RydEceL+bFFADplZG/ebZObq8dyytMjlmjr7WRnngE7d9A/3iEcJ2lYa6Ad176JyF500jrhjgj6iktkVQdYIOq2wFY0jJbvDuQE1RxjC+KKP04AzLHMflXzSSU70i6ZmJ5jfSyYjWIzO4FQZH1HOTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3x41Rb2I6orly7EQDa5DfFOmjXOnn5NIBnDb4DBxO9A=; b=S2Hk3aD4yFEbqjUPrA2nKp9WX8+xbVTNGcLmJLbfdAWvWSiH82VftjIvSOEzI29JJCyKYxl0uC6sEswKThMpAxeboc6DMZDoBVibnNmnGpu4XyLV6WSDtpZwu8dgUjnqqjEvpgJaCJXEsS+Av4+4rgo3eQExAmamntcPFTWhjQ8= Received: from DM5PR07CA0108.namprd07.prod.outlook.com (2603:10b6:4:ae::37) by CH2PR12MB3880.namprd12.prod.outlook.com (2603:10b6:610:2b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 20:16:53 +0000 Received: from DM6NAM11FT052.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::f7) by DM5PR07CA0108.outlook.office365.com (2603:10b6:4:ae::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 20:16:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB01.amd.com; Received: from SATLEXMB01.amd.com (165.204.84.17) by DM6NAM11FT052.mail.protection.outlook.com (10.13.172.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 20:16:53 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB01.amd.com (10.181.40.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 17 Mar 2021 15:16:52 -0500 Received: from LinuxHost.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2106.2 via Frontend Transport; Wed, 17 Mar 2021 15:16:48 -0500 From: Vijendar Mukunda To: , CC: , , , , , , Vijendar Mukunda , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto , Chuhong Yuan , Pierre-Louis Bossart , open list Subject: [PATCH v1 2/2] ASoC: amd: fix multiple definition error Date: Thu, 18 Mar 2021 02:03:47 +0530 Message-ID: <1616013238-12254-2-git-send-email-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1616013238-12254-1-git-send-email-Vijendar.Mukunda@amd.com> References: <1616013238-12254-1-git-send-email-Vijendar.Mukunda@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6cae124-3933-4f46-0828-08d8e9819b1c X-MS-TrafficTypeDiagnostic: CH2PR12MB3880: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:376; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Kzrbnm81qso/fHXwFcSKWLJ2dz6S0zfviIHSZgyy15JKnmlxdk0nEtGrGdgwD5ZZhOU1f1pcmDIPdod2WjiefelUl7XA+oxeO6TjWA1T/UUbeQn4uWx9MByaH1EMb9NbfEZ23niausID9BDo7Xx9/Jzc4dwGTKEE6/QVQkoUR7fXjoGutTCpo+dZLry7hZs4cGPlEPETCEK+EBmSYU+ZGpR3cVszsGO8LO9Czl9ewwuO7s84hPvfK1FsTZuRjLJSonVq8txMjsFAuyFRjYedZHysQbCtiA3/iOcZbUi1/lcbNfELx2cZcqAhMZFyqLUVnTxHc+X/fFFRDA1OIx3/xa7OiLy9xsM95IwCDZxYaKvvGrp+REpyfsuBTGdl6Ui9Bm0ax3YiMUqBRfyzYSFHCXV2zAYb3fYA/xE6eB0/7uiD6zwfT73NUlgQ6jIKAy4oT4mRqJVpHMOE3O92FNMespn6ZSgu7ec0GHVjyUVyzPmor7bcXUbx7CQBqXS0ZMf55tXUc0n5zoBY/GQys6pPYKGgr1H2ZDtkjhZVfUhux9oLoWIyILkahKNzNgqN5DAlfBm7rH8CSCHdVkcXC/0huSk88T/XZopFXh/0CjNBXtswWEfyZ67P5lP95JBAg+lErfoChNEj7IzX+Up7PemL0k5yYyxJ9WB/EeXTWFwfe3/Bc6G0XhfX2q8OkCLB4C1l X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SATLEXMB01.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(376002)(136003)(346002)(396003)(39860400002)(46966006)(36840700001)(4326008)(82310400003)(2906002)(186003)(47076005)(54906003)(83380400001)(2616005)(82740400003)(110136005)(7696005)(356005)(5660300002)(81166007)(426003)(36756003)(316002)(7416002)(8936002)(336012)(8676002)(36860700001)(26005)(86362001)(478600001)(70206006)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 20:16:53.4284 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6cae124-3933-4f46-0828-08d8e9819b1c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB01.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT052.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3880 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org make W=1 ARCH=x86_64 error: acp3x-rt5682-max9836.c:(.text+0x840): multiple definition of `soc_is_rltk_max'; sound/soc/amd/acp-da7219-max98357a.o:acp-da7219-max98357a.c: (.text+0xd00):first defined here Reported-by: kernel test robot Signed-off-by: Vijendar Mukunda --- sound/soc/amd/acp-da7219-max98357a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 7fca4e78..458d9fdca 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -34,7 +34,7 @@ static struct clk *da7219_dai_bclk; static struct clk *rt5682_dai_wclk; static struct clk *rt5682_dai_bclk; extern bool bt_uart_enable; -void *soc_is_rltk_max(struct device *dev); +void *acp_soc_is_rltk_max(struct device *dev); static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) { @@ -666,7 +666,7 @@ static struct snd_soc_card cz_rt5682_card = { .num_controls = ARRAY_SIZE(cz_mc_controls), }; -void *soc_is_rltk_max(struct device *dev) +void *acp_soc_is_rltk_max(struct device *dev) { const struct acpi_device_id *match; @@ -715,7 +715,7 @@ static int cz_probe(struct platform_device *pdev) struct regulator_dev *rdev; struct device *dev = &pdev->dev; - card = (struct snd_soc_card *)soc_is_rltk_max(dev); + card = (struct snd_soc_card *)acp_soc_is_rltk_max(dev); if (!card) return -ENODEV; if (!strcmp(card->name, "acpd7219m98357")) { -- 2.7.4