6 files changed, 13 insertions, 19 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4a489ae44a6e..2d10090a08c0 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -649,8 +649,8 @@ struct snd_soc_card {
 
         bool instantiated;
 
-        int (*probe)(struct platform_device *pdev);
-        int (*remove)(struct platform_device *pdev);
+        int (*probe)(struct snd_soc_card *card);
+        int (*remove)(struct snd_soc_card *card);
 
         /* the pre and post PM functions are used to do any PM work before and
          * after the codec and DAI's do any PM work. */
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 7d7847a1e66b..c16c6b2eff95 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -53,9 +53,8 @@ struct mpc8610_hpcd_data {
  *
  * Here we program the DMACR and PMUXCR registers.
  */
-static int mpc8610_hpcd_machine_probe(struct platform_device *sound_device)
+static int mpc8610_hpcd_machine_probe(struct snd_soc_card *card)
 {
-        struct snd_soc_card *card = platform_get_drvdata(sound_device);
         struct mpc8610_hpcd_data *machine_data =
                 container_of(card, struct mpc8610_hpcd_data, card);
         struct ccsr_guts_86xx __iomem *guts;
@@ -138,9 +137,8 @@ static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream)
  * This function is called to remove the sound device for one SSI.  We
  * de-program the DMACR and PMUXCR register.
  */
-static int mpc8610_hpcd_machine_remove(struct platform_device *sound_device)
+static int mpc8610_hpcd_machine_remove(struct snd_soc_card *card)
 {
-        struct snd_soc_card *card = platform_get_drvdata(sound_device);
         struct mpc8610_hpcd_data *machine_data =
                 container_of(card, struct mpc8610_hpcd_data, card);
         struct ccsr_guts_86xx __iomem *guts;
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 026b756961e0..66e0b68af147 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -85,9 +85,8 @@ struct machine_data {
  *
  * Here we program the DMACR and PMUXCR registers.
  */
-static int p1022_ds_machine_probe(struct platform_device *sound_device)
+static int p1022_ds_machine_probe(struct snd_soc_card *card)
 {
-        struct snd_soc_card *card = platform_get_drvdata(sound_device);
         struct machine_data *mdata =
                 container_of(card, struct machine_data, card);
         struct ccsr_guts_85xx __iomem *guts;
@@ -160,9 +159,8 @@ static int p1022_ds_startup(struct snd_pcm_substream *substream)
  * This function is called to remove the sound device for one SSI.  We
  * de-program the DMACR and PMUXCR register.
  */
-static int p1022_ds_machine_remove(struct platform_device *sound_device)
+static int p1022_ds_machine_remove(struct snd_soc_card *card)
 {
-        struct snd_soc_card *card = platform_get_drvdata(sound_device);
         struct machine_data *mdata =
                 container_of(card, struct machine_data, card);
         struct ccsr_guts_85xx __iomem *guts;
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index f75804ef0897..489139a31cf9 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -237,7 +237,7 @@ static struct snd_soc_dai_link tosa_dai[] = {
 },
 };
 
-static int tosa_probe(struct platform_device *dev)
+static int tosa_probe(struct snd_soc_card *card)
 {
         int ret;
 
@@ -251,7 +251,7 @@ static int tosa_probe(struct platform_device *dev)
         return ret;
 }
 
-static int tosa_remove(struct platform_device *dev)
+static int tosa_remove(struct snd_soc_card *card)
 {
         gpio_free(TOSA_GPIO_L_MUTE);
         return 0;
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 7b729013a728..c5858296b48a 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -189,7 +189,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
 },
 };
 
-static int zylonite_probe(struct platform_device *pdev)
+static int zylonite_probe(struct snd_soc_card *card)
 {
         int ret;
 
@@ -216,7 +216,7 @@ static int zylonite_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int zylonite_remove(struct platform_device *pdev)
+static int zylonite_remove(struct snd_soc_card *card)
 {
         if (clk_pout) {
                 clk_disable(pout);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 446838e7d3ec..4bc2365bf1dd 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1717,7 +1717,6 @@ static int snd_soc_init_codec_cache(struct snd_soc_codec *codec,
 
 static void snd_soc_instantiate_card(struct snd_soc_card *card)
 {
-        struct platform_device *pdev = to_platform_device(card->dev);
         struct snd_soc_codec *codec;
         struct snd_soc_codec_conf *codec_conf;
         enum snd_soc_compress_type compress_type;
@@ -1781,7 +1780,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 
         /* initialise the sound card only once */
         if (card->probe) {
-                ret = card->probe(pdev);
+                ret = card->probe(card);
                 if (ret < 0)
                         goto card_probe_error;
         }
@@ -1842,7 +1841,7 @@ probe_dai_err:
 
 card_probe_error:
         if (card->remove)
-                card->remove(pdev);
+                card->remove(card);
 
         snd_card_free(card->snd_card);
 
@@ -1888,7 +1887,6 @@ static int soc_probe(struct platform_device *pdev)
 
 static int soc_cleanup_card_resources(struct snd_soc_card *card)
 {
-        struct platform_device *pdev = to_platform_device(card->dev);
         int i;
 
         /* make sure any delayed work runs */
@@ -1909,7 +1907,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
 
         /* remove the card */
         if (card->remove)
-                card->remove(pdev);
+                card->remove(card);
 
         kfree(card->rtd);
         snd_card_free(card->snd_card);