ASoC: amd: ps: update macros with ps platform naming convention

Update macros using ps platform naming convention.

Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com>
Link: https://lore.kernel.org/r/20221116105938.762550-1-Syed.SabaKareem@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h
index 85f869c2229f554416d2e6cd77e611cf599fbe05..a90ba3b20dc79da8b67cce66a43aa24accf6c1d1 100644 (file)
--- a/sound/soc/amd/ps/acp63.h
+++ b/sound/soc/amd/ps/acp63.h
@@ -8,10 +8,10 @@
 #include <sound/acp63_chip_offset_byte.h>
 
 #define ACP_DEVICE_ID 0x15E2
-#define ACP6x_REG_START                0x1240000
-#define ACP6x_REG_END          0x1250200
-#define ACP6x_DEVS             3
-#define ACP6x_PDM_MODE         1
+#define ACP63_REG_START                0x1240000
+#define ACP63_REG_END          0x1250200
+#define ACP63_DEVS             3
+#define ACP63_PDM_MODE         1
 
 #define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK  0x00010001
 #define ACP_PGFSM_CNTL_POWER_ON_MASK   1

diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c
index 08c4b9bef055dee16b112de9d02262a2f3aec63d..98dddd1a0cf4fcc55391d18311b738523e7096c1 100644 (file)
--- a/sound/soc/amd/ps/pci-ps.c
+++ b/sound/soc/amd/ps/pci-ps.c
@@ -21,7 +21,7 @@ struct acp63_dev_data {
        void __iomem *acp63_base;
        struct resource *res;
        bool acp63_audio_mode;
-       struct platform_device *pdev[ACP6x_DEVS];
+       struct platform_device *pdev[ACP63_DEVS];
 };
 
 static int acp63_power_on(void __iomem *acp_base)
@@ -143,7 +143,7 @@ static int snd_acp63_probe(struct pci_dev *pci,
                           const struct pci_device_id *pci_id)
 {
        struct acp63_dev_data *adata;
-       struct platform_device_info pdevinfo[ACP6x_DEVS];
+       struct platform_device_info pdevinfo[ACP63_DEVS];
        int index, ret;
        int val = 0x00;
        struct acpi_device *adev;
@@ -219,8 +219,8 @@ static int snd_acp63_probe(struct pci_dev *pci,
                        adata->res->name = "acp_iomem";
                        adata->res->flags = IORESOURCE_MEM;
                        adata->res->start = addr;
-                       adata->res->end = addr + (ACP6x_REG_END - ACP6x_REG_START);
-                       adata->acp63_audio_mode = ACP6x_PDM_MODE;
+                       adata->res->end = addr + (ACP63_REG_END - ACP63_REG_START);
+                       adata->acp63_audio_mode = ACP63_PDM_MODE;
 
                        memset(&pdevinfo, 0, sizeof(pdevinfo));
                        pdevinfo[0].name = "acp_ps_pdm_dma";
@@ -237,7 +237,7 @@ static int snd_acp63_probe(struct pci_dev *pci,
                        pdevinfo[2].id = 0;
                        pdevinfo[2].parent = &pci->dev;
 
-                       for (index = 0; index < ACP6x_DEVS; index++) {
+                       for (index = 0; index < ACP63_DEVS; index++) {
                                adata->pdev[index] =
                                        platform_device_register_full(&pdevinfo[index]);
 
@@ -312,8 +312,8 @@ static void snd_acp63_remove(struct pci_dev *pci)
        int ret, index;
 
        adata = pci_get_drvdata(pci);
-       if (adata->acp63_audio_mode == ACP6x_PDM_MODE) {
-               for (index = 0; index < ACP6x_DEVS; index++)
+       if (adata->acp63_audio_mode == ACP63_PDM_MODE) {
+               for (index = 0; index < ACP63_DEVS; index++)
                        platform_device_unregister(adata->pdev[index]);
        }
        ret = acp63_deinit(adata->acp63_base, &pci->dev);