CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/fsl/p1022_ds.c

 /**
  * Freescale P1022DS ALSA SoC Machine driver
  *
  * Author: Timur Tabi <timur@freescale.com>
  *
  * Copyright 2010 Freescale Semiconductor, Inc.
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2.  This program is licensed "as is" without any warranty of any
  * kind, whether express or implied.
@@ skipping 67 matching lines @@
         char platform_name[2][DAI_NAME_SIZE]; /* One for each DMA channel */
 };
 
 /**
  * p1022_ds_machine_probe: initialize the board
  *
  * This function is used to initialize the board-specific hardware.
  *
  * 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;
 
         guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx));
         if (!guts) {
                 dev_err(card->dev, "could not map global utilities\n");
                 return -ENOMEM;
         }
 
@@ skipping 52 matching lines @@
 
         return 0;
 }
 
 /**
  * p1022_ds_machine_remove: Remove the sound device
  *
  * 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;
 
         guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx));
         if (!guts) {
                 dev_err(card->dev, "could not map global utilities\n");
                 return -ENOMEM;
         }
 
@@ skipping 407 matching lines @@
 {
         platform_driver_unregister(&p1022_ds_driver);
 }
 
 module_init(p1022_ds_init);
 module_exit(p1022_ds_exit);
 
 MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
 MODULE_DESCRIPTION("Freescale P1022 DS ALSA SoC machine driver");
 MODULE_LICENSE("GPL v2");