ASoC: Intel: (cosmetic) simplify structure member access

Fix a clumsy structure member dereference in all machine drivers.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200312194859.4051-8-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c
index 1a302436d450370bbbab5cce231e40959a40bdff..058abf3eec501f8ffe6a6f71b35ef9c68a7a4ca1 100644 (file)
--- a/sound/soc/intel/boards/bdw-rt5650.c
+++ b/sound/soc/intel/boards/bdw-rt5650.c
@@ -298,7 +298,7 @@ static int bdw_rt5650_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        /* override plaform name, if required */
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5650_card,
                                                    mach->mach_params.platform);
 

diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c
index bb643c99069dfd9f761955c1c958b1325d6637f5..a94f498388e14561ac79bdc6e34cea483396cfdd 100644 (file)
--- a/sound/soc/intel/boards/bdw-rt5677.c
+++ b/sound/soc/intel/boards/bdw-rt5677.c
@@ -412,7 +412,7 @@ static int bdw_rt5677_probe(struct platform_device *pdev)
        }
 
        /* override plaform name, if required */
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5677_card,
                                                    mach->mach_params.platform);
        if (ret)

diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c
index b9c12e24c70bc0297485356f8b8568607d9b8b54..25178000c6a55c5ba98eb1bfb6028cd5a74d2d96 100644 (file)
--- a/sound/soc/intel/boards/broadwell.c
+++ b/sound/soc/intel/boards/broadwell.c
@@ -283,7 +283,7 @@ static int broadwell_audio_probe(struct platform_device *pdev)
        broadwell_rt286.dev = &pdev->dev;
 
        /* override plaform name, if required */
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        ret = snd_soc_fixup_dai_links_platform_name(&broadwell_rt286,
                                                    mach->mach_params.platform);
        if (ret)

diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 9177401c37a53db60e0d68454c5904334280da7c..061462248bce027e35ea1af0bccb515c5a010f37 100644 (file)
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -721,7 +721,7 @@ static int broxton_audio_probe(struct platform_device *pdev)
        }
 
        /* override plaform name, if required */
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        platform_name = mach->mach_params.platform;
 
        ret = snd_soc_fixup_dai_links_platform_name(&broxton_audio_card,

diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
index 4b67f261377c25ef4fd89abcfc8707772b3b5f1e..4b5e7f6dbdf1cfd381f5683d61d26b83184f9280 100644 (file)
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
@@ -627,7 +627,7 @@ static int broxton_audio_probe(struct platform_device *pdev)
        snd_soc_card_set_drvdata(card, ctx);
 
        /* override plaform name, if required */
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        platform_name = mach->mach_params.platform;
 
        ret = snd_soc_fixup_dai_links_platform_name(card,

diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c
index eda7a500cad6c3848c39ba472aefb5d4e994a82b..d6b912c013fc56957df122e0e614d06776333630 100644 (file)
--- a/sound/soc/intel/boards/bytcht_da7213.c
+++ b/sound/soc/intel/boards/bytcht_da7213.c
@@ -231,7 +231,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
        int ret_val = 0;
        int i;
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        card = &bytcht_da7213_card;
        card->dev = &pdev->dev;
 

diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
index 70bb86f3342ff90e7aba8c6dfdf0034e2ea06753..ea119d52392659fe11e4bdb251a8ca4579563681 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
@@ -553,7 +553,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
 
        /* override plaform name, if required */
        snd_soc_card_cht.dev = &pdev->dev;
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        platform_name = mach->mach_params.platform;
 
        ret_val = snd_soc_fixup_dai_links_platform_name(&snd_soc_card_cht,

diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c
index 501bad3976fbfcfc99a9287b1ad5c8b775c46bc8..34d4e17e329594d1e5feb028eca14197e16337f1 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_nau8824.c
+++ b/sound/soc/intel/boards/cht_bsw_nau8824.c
@@ -259,7 +259,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
 
        /* override plaform name, if required */
        snd_soc_card_cht.dev = &pdev->dev;
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        platform_name = mach->mach_params.platform;
 
        ret_val = snd_soc_fixup_dai_links_platform_name(&snd_soc_card_cht,

diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index b5b016d493f187c6c90bda62c44a6819346b43c2..452691db12ccb7623745c851f9b73c809b8e25b4 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -539,7 +539,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
        if (!drv)
                return -ENOMEM;
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
 
        for (i = 0; i < ARRAY_SIZE(snd_soc_cards); i++) {
                if (acpi_dev_found(snd_soc_cards[i].codec_id) &&

diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c
index 2a6e5b124099236142266f675deb6e6122f2c3c7..30de502b4fbb40a563432b5fe28df94a1566fb04 100644 (file)
--- a/sound/soc/intel/boards/cml_rt1011_rt5682.c
+++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c
@@ -451,7 +451,7 @@ static int snd_cml_rt1011_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        snd_soc_card_cml.dev = &pdev->dev;
        platform_name = mach->mach_params.platform;
 

diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c
index 8e947bad143c86543cc9a941374b814225707054..ea1de8b3f3cdd42544737c5a137786167388d3e3 100644 (file)
--- a/sound/soc/intel/boards/glk_rt5682_max98357a.c
+++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c
@@ -604,7 +604,7 @@ static int geminilake_audio_probe(struct platform_device *pdev)
        snd_soc_card_set_drvdata(card, ctx);
 
        /* override plaform name, if required */
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        platform_name = mach->mach_params.platform;
 
        ret = snd_soc_fixup_dai_links_platform_name(card, platform_name);

diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c
index 3dadf9bff796a3d73802d4abacdfa85909fb6f12..6589fa56873f325bf1e86f7c5d40e1e715477933 100644 (file)
--- a/sound/soc/intel/boards/haswell.c
+++ b/sound/soc/intel/boards/haswell.c
@@ -193,7 +193,7 @@ static int haswell_audio_probe(struct platform_device *pdev)
        haswell_rt5640.dev = &pdev->dev;
 
        /* override plaform name, if required */
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        ret = snd_soc_fixup_dai_links_platform_name(&haswell_rt5640,
                                                    mach->mach_params.platform);
        if (ret)

diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
index f65feee1c16603dc4ca69944b0a7a5951789095c..20d566e9dd9d80ba85e175f5d8a0adc6a707833a 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
@@ -962,7 +962,7 @@ static int kabylake_audio_probe(struct platform_device *pdev)
        kabylake_audio_card->dev = &pdev->dev;
        snd_soc_card_set_drvdata(kabylake_audio_card, ctx);
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        if (mach)
                dmic_constraints = mach->mach_params.dmic_num == 2 ?
                        &constraints_dmic_2ch : &constraints_dmic_channels;

diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 341bb47311a682f89569207972ae939a04ab6891..6493ede8930014c05365a628b8ce87160af1b690 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -772,7 +772,7 @@ static int kabylake_audio_probe(struct platform_device *pdev)
        kabylake_audio_card.dev = &pdev->dev;
        snd_soc_card_set_drvdata(&kabylake_audio_card, ctx);
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        if (mach)
                dmic_constraints = mach->mach_params.dmic_num == 2 ?
                        &constraints_dmic_2ch : &constraints_dmic_channels;

diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c
index fe2d3a23a4efe260407a015d0a21b69271cbf981..3be764299ab0035a2fe8c0e7e9e0155e0a8432a8 100644 (file)
--- a/sound/soc/intel/boards/skl_hda_dsp_generic.c
+++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c
@@ -182,7 +182,7 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
 
        INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        if (!mach)
                return -EINVAL;
 

diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
index e6de3b28d8406e77bfb8c74e3c7a953caf486ce4..8216c15fc8da17a582543800504aba512d9533a6 100644 (file)
--- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c
+++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
@@ -660,7 +660,7 @@ static int skylake_audio_probe(struct platform_device *pdev)
        skylake_audio_card.dev = &pdev->dev;
        snd_soc_card_set_drvdata(&skylake_audio_card, ctx);
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        if (mach)
                dmic_constraints = mach->mach_params.dmic_num == 2 ?
                        &constraints_dmic_2ch : &constraints_dmic_channels;

diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
index c99c8b23e509b0c2cdeac4be8e81f595a181c460..6f68712ffce95d69fa3aa0acd1c0961444ea8dca 100644 (file)
--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
@@ -703,7 +703,7 @@ static int skylake_audio_probe(struct platform_device *pdev)
        skylake_audio_card.dev = &pdev->dev;
        snd_soc_card_set_drvdata(&skylake_audio_card, ctx);
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        if (mach)
                dmic_constraints = mach->mach_params.dmic_num == 2 ?
                        &constraints_dmic_2ch : &constraints_dmic_channels;

diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c
index 8f44f13d2848122e13cfcab4f8b22a7c9bb07cfc..8c657da5fcf0fc6dd1ede1e6d3f9d948d06d03b8 100644 (file)
--- a/sound/soc/intel/boards/sof_da7219_max98373.c
+++ b/sound/soc/intel/boards/sof_da7219_max98373.c
@@ -335,7 +335,7 @@ static int audio_probe(struct platform_device *pdev)
        card = (struct snd_soc_card *)pdev->id_entry->driver_data;
        card->dev = &pdev->dev;
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
        ret = snd_soc_fixup_dai_links_platform_name(card,
                                                    mach->mach_params.platform);
        if (ret)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 5d878873a8e08535f7af1f97ed40b25fe5b64540..99b5a5e01e381471524e9b3fa53ed227b3b025d7 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -604,7 +604,7 @@ static int sof_audio_probe(struct platform_device *pdev)
 
        dmi_check_system(sof_rt5682_quirk_table);
 
-       mach = (&pdev->dev)->platform_data;
+       mach = pdev->dev.platform_data;
 
        /* A speaker amp might not be present when the quirk claims one is.
         * Detect this via whether the machine driver match includes quirk_data.