CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/fsl/mpc8610_hpcd.c

 /**
  * Freescale MPC8610HPCD ALSA SoC Machine driver
  *
  * Author: Timur Tabi <timur@freescale.com>
  *
  * Copyright 2007-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 35 matching lines @@
         char platform_name[2][DAI_NAME_SIZE]; /* One for each DMA channel */
 };
 
 /**
  * mpc8610_hpcd_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 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;
 
         guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx));
         if (!guts) {
                 dev_err(card->dev, "could not map global utilities\n");
                 return -ENOMEM;
         }
 
@@ skipping 62 matching lines @@
 
         return 0;
 }
 
 /**
  * mpc8610_hpcd_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 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;
 
         guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx));
         if (!guts) {
                 dev_err(card->dev, "could not map global utilities\n");
                 return -ENOMEM;
         }
 
@@ skipping 427 matching lines @@
 {
         platform_driver_unregister(&mpc8610_hpcd_driver);
 }
 
 module_init(mpc8610_hpcd_init);
 module_exit(mpc8610_hpcd_exit);
 
 MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
 MODULE_DESCRIPTION("Freescale MPC8610 HPCD ALSA SoC machine driver");
 MODULE_LICENSE("GPL v2");