From:   Daniel Baluta <daniel.baluta@oss.nxp.com>
To:     broonie@kernel.org, alsa-devel@alsa-project.org
Cc:     pierre-louis.bossart@linux.intel.com, lgirdwood@gmail.com,
        daniel.baluta@nxp.com, daniel.baluta@gmail.com,
        AjitKumar.Pandey@amd.com, Balakishore.pati@amd.com,
        vsreddy@amd.com, Julian.Schroeder@amd.com,
        vishnuvardhanrao.ravulapati@amd.com, linux-kernel@vger.kernel.org,
        yc.hung@mediatek.com, linux-mediatek@lists.infradead.org,
        Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Subject: [PATCH 10/21] ASoC: amd: acp-config: Remove legacy acpi based machine struct
Date:   Wed, 17 Nov 2021 11:37:23 +0200
Message-Id: <20211117093734.17407-11-daniel.baluta@oss.nxp.com>
In-Reply-To: <20211117093734.17407-1-daniel.baluta@oss.nxp.com>
References: <20211117093734.17407-1-daniel.baluta@oss.nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (2a02:2f08:5706:b700:22bb:b216:ffff:73e1) by AM3PR03CA0060.eurprd03.prod.outlook.com (2603:10a6:207:5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.19 via Frontend Transport; Wed, 17 Nov 2021 09:38:21 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 8501f176-cd72-405f-36e0-08d9a9adff2c
X-MS-TrafficTypeDiagnostic: VI1PR04MB3039:
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-Microsoft-Antispam-PRVS: <VI1PR04MB3039C14A3AD4853F9E2FC512B89A9@VI1PR04MB3039.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:639;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: d8MBTTM77iKsY6l1DNvKCN1EgDCRiUT9UlDjZFtS6n4ro71xXR0tWboWfFi123hcBdinGVievlwAqjKzi4edK5c0scfGozTurB1P9gBzFhc28WdVZ6LBOoC6P0iKP5FtCntlYatXL3c3wahT30peg4oMqqKOp21v1Y5m03zoKA8QNvul0jSaOjfU/eObP/HJKcuCoDs5+Gp2HR7zFzBGIc9urQak7/FN4Xf+bR8KcADnFAYlLDEgj1xSAzT55hhuWMjZtLFMCCnGoKSi1sxMziLmeOvRvR0IRyg5mCWEp5+9fm+9YD0G3JN9VD4xyzlhwpHGLEMxqMCbRVKs2hhojPs1fRmf7PemPL651bH8bS/KBy81RtlQNKgI7dUcw8vorh2y/upj6E7oFRUyJtfP6DwFY+chSJLKsSlPw4AQ//rVbN9nDxmHpxatOLvXJLcsTBw5eV+8XQNOQyc8xvHqvJyFHeZ/506HUcF6umq+RSToYwgoM9hZn4Cj5j4WQuHZAUKb5B674RRdkgJCaU6KMQE65G36q0ctyjzQVGNZEX4wPq8Nx33bhrJv41YEeFnI2/wC6q2O31Xe44MiqhAwEEWqn0WhIlh3knSvNbAqkFPuwm5XQABdphStWwsq4t6diXwpBDgZp+4FCcpT8qA+/g==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5151.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66476007)(186003)(44832011)(52116002)(6486002)(5660300002)(66556008)(6512007)(6506007)(4326008)(7416002)(2616005)(8936002)(8676002)(1076003)(2906002)(66946007)(83380400001)(508600001)(86362001)(316002)(38100700002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0+IjNLG/gBPchNwU2WNmIc/vyomVtLmRMtv1eyjkoChtj1YLt5h2Hn8MKrxJ?=
 =?us-ascii?Q?TRp59LbxOCEye32z5lc+Akz5el8nkQ21crgq8J5ZGA496jIdJ/V09OiqjE2x?=
 =?us-ascii?Q?+arNhqLlpTBWtF8D8eICFc9z7TeqlsmvlgrEmdAmTDlvzhYqs39L7Q67cJF/?=
 =?us-ascii?Q?1MGlmHYARD9PJgvOcC6oQSl659v0N6ZXKBlYlROHiFuDstEBnzO25V25xPKf?=
 =?us-ascii?Q?M16sCiPCbn/HSm+AQCzb+PnLheq8hGYd7ekgj3/0y6guzZQVoIwV17ArTA7K?=
 =?us-ascii?Q?ZJAa9yRohunHODK8P4a43HRvW0od2Moolk//yhBMlVDjdB6Uxsxew5JlI4gm?=
 =?us-ascii?Q?ab/Oz/V/5S7w/ZbQbGJuhn6vXprru+0s9MdumBnfHSdWuU7TJxJCopafLa86?=
 =?us-ascii?Q?JeAvaZNf5Ul1wC1WsZ9iFJqanAiPiU8RD4o5FBdf17nnt9x+tdN1WPAgtfrO?=
 =?us-ascii?Q?0HBjgqIb/bThZ6Vk8XbgK9QhvDOOpcfiojQ87Yl851GilkGxbKY1QPLxzSej?=
 =?us-ascii?Q?PTUTrVC61x/2vjYDEVyKyJxKY65eCsTIx7HpbleZw7SgPGaUZHqg9vTVAF3r?=
 =?us-ascii?Q?KG+qYnTVGst1PlsYjCEgp4ICwPfAkeSRRIfj3zWu36F9ZSAHJ9IwqrqgrWSi?=
 =?us-ascii?Q?B9P1qaMlswMjh/5yRo04asRCeq5X7ANk1PagZjf6wHq/14sgh3s2dT0c9UUO?=
 =?us-ascii?Q?OHRwtPIpynnH4ZRp2iDU10U7s6UFaFujeTljVP7xoP1oCgyJfIa1hEn8qNSK?=
 =?us-ascii?Q?sopDCTxw+c4LheOTk3f2Baty7SRecHktZtLTgfe2HJOd0Wqs5tWq43wJDKSB?=
 =?us-ascii?Q?7KtJ+w5pIMaohDwAMMUFHLTT/LRXajiQ3SSRQ9/cJxSkQULfeZCAWaQ4jlCq?=
 =?us-ascii?Q?z0PGNZ1QJ/kpy6qSyA2W3GimcpA1FwRscz9Qx1RbmoXddpyWyhc8RLZ2Xs8/?=
 =?us-ascii?Q?HjEaJqvJj8iOQS8rDPO4h1DxvXkd28Vpscnz0+q5v/4JTK1MjTf/7Xu9XBST?=
 =?us-ascii?Q?eMpNnONsIVSuWIY8JMjz6TmzIwh1rpfnVYtYnszHe3HiqP4tLQsxeAxgA2wT?=
 =?us-ascii?Q?In+MotBuRvIN3QQJX6s0dK4D+ZdbpluRkuvuw7Ui4PUDstv4Bf8H2GO192UW?=
 =?us-ascii?Q?bCRa5homGOKKYqhkWmZ2aF8IhEXSijHTlahJfYLXTnmIGKw/wowjH+SHwt3n?=
 =?us-ascii?Q?OREjArb9klEzYMDVWG/5H9FVHRVBrAui2TZOnvRkBnUzEeAMprH5Zr1LMAQk?=
 =?us-ascii?Q?cp4iYJxro44UQWFNUIq8sTgLilRv6Du1d2cv9zspWW7wU0B8KcH0xcD0SrAj?=
 =?us-ascii?Q?w9MFkmrWI/4ISo1LsLJb91cMfbEXSwnE/lqHtJp9virfrg/7AjyTiqgIpY20?=
 =?us-ascii?Q?ItzPDI7muY7wS6m8ub9Hj+mZwDkyjFDnntIjJFh+l2JoS/YNx6aWp/dmDBQq?=
 =?us-ascii?Q?npSqThI5KuCmg+DuBp0ZT3tc76Lp4W/l6nb3dBvcSbFnzdsJhDgTXa+4st6J?=
 =?us-ascii?Q?PSEFMI3/90qU9+o0gibasv4+dYLJFh7c3b8a1/qERCTzza9HsJga2X6+4m92?=
 =?us-ascii?Q?8wC28DW9NSzoJAz0JBiVIrA+yW7VKOhyjd8p/dh/Nx6a9NqmimigIyHGC/AB?=
 =?us-ascii?Q?wX7cc+SkW0XBPF0AiM3fY3AElb4SLncBg3EbRXUsBdPjOz3PEad+cIdSk4bX?=
 =?us-ascii?Q?EnLlpfFngABsouaiXyrph2xxd8Q=3D?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8501f176-cd72-405f-36e0-08d9a9adff2c
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5151.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2021 09:38:22.6649
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: W3gBnH+ASvmxTJaMSB1yNKvA6sWXRX5P41ztAr25iE0eF50USzjItjayCi+PAs7YTRhB4HrZZEG2VXCmR61iEg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3039
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>

We have moved legacy based machine struct into platform driver to
resolve module dependency with non-SOF ALSA build, hence removed
it from acp-config driver module.

Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 sound/soc/amd/acp-config.c  | 10 ----------
 sound/soc/amd/mach-config.h |  1 -
 2 files changed, 11 deletions(-)

diff --git a/sound/soc/amd/acp-config.c b/sound/soc/amd/acp-config.c
index c9abbb46b6f5..1493d52c9290 100644
--- a/sound/soc/amd/acp-config.c
+++ b/sound/soc/amd/acp-config.c
@@ -68,14 +68,4 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[] = {
 };
 EXPORT_SYMBOL(snd_soc_acpi_amd_sof_machines);
 
-struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[] = {
-	{
-		.id = "AMDI1019",
-		.drv_name = "renoir-acp",
-		.pdata = (void *)&acp_quirk_data,
-	},
-	{},
-};
-EXPORT_SYMBOL(snd_soc_acpi_amd_acp_machines);
-
 MODULE_LICENSE("Dual BSD/GPL");
diff --git a/sound/soc/amd/mach-config.h b/sound/soc/amd/mach-config.h
index 608f1e199775..feb3756d9ac4 100644
--- a/sound/soc/amd/mach-config.h
+++ b/sound/soc/amd/mach-config.h
@@ -18,7 +18,6 @@
 #define ACP_PCI_DEV_ID			0x15E2
 
 extern struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[];
-extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[];
 
 struct config_entry {
 	u32 flags;
-- 
2.27.0