5 files changed, 45 insertions, 32 deletions

diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 6680c0b4d20..cb50598338e 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -294,9 +294,11 @@ static irqreturn_t fsl_dma_isr(int irq, void *dev_id)
  * Regardless of where the memory is actually allocated, since the device can
  * technically DMA to any 36-bit address, we do need to set the DMA mask to 36.
  */
-static int fsl_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
-        struct snd_pcm *pcm)
+static int fsl_dma_new(struct snd_soc_pcm_runtime *rtd)
 {
+        struct snd_card *card = rtd->card->snd_card;
+        struct snd_soc_dai *dai = rtd->cpu_dai;
+        struct snd_pcm *pcm = rtd->pcm;
         static u64 fsl_dma_dmamask = DMA_BIT_MASK(36);
         int ret;
 
@@ -877,10 +879,12 @@ static struct device_node *find_ssi_node(struct device_node *dma_channel_np)
                  * assume that device_node pointers are a valid comparison.
                  */
                 np = of_parse_phandle(ssi_np, "fsl,playback-dma", 0);
+                of_node_put(np);
                 if (np == dma_channel_np)
                         return ssi_np;
 
                 np = of_parse_phandle(ssi_np, "fsl,capture-dma", 0);
+                of_node_put(np);
                 if (np == dma_channel_np)
                         return ssi_np;
         }
@@ -939,7 +943,7 @@ static int __devinit fsl_soc_dma_probe(struct platform_device *pdev)
 
         iprop = of_get_property(ssi_np, "fsl,fifo-depth", NULL);
         if (iprop)
-                dma->ssi_fifo_depth = *iprop;
+                dma->ssi_fifo_depth = be32_to_cpup(iprop);
         else
                 /* Older 8610 DTs didn't have the fifo-depth property */
                 dma->ssi_fifo_depth = 8;
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 313e0ccedd5..672982924f1 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -678,7 +678,12 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
                 kfree(ssi_private);
                 return ret;
         }
-        ssi_private->ssi = ioremap(res.start, 1 + res.end - res.start);
+        ssi_private->ssi = of_iomap(np, 0);
+        if (!ssi_private->ssi) {
+                dev_err(&pdev->dev, "could not map device resources\n");
+                kfree(ssi_private);
+                return -ENOMEM;
+        }
         ssi_private->ssi_phys = res.start;
         ssi_private->irq = irq_of_parse_and_map(np, 0);
 
@@ -691,13 +696,14 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
         /* Determine the FIFO depth. */
         iprop = of_get_property(np, "fsl,fifo-depth", NULL);
         if (iprop)
-                ssi_private->fifo_depth = *iprop;
+                ssi_private->fifo_depth = be32_to_cpup(iprop);
         else
                 /* Older 8610 DTs didn't have the fifo-depth property */
                 ssi_private->fifo_depth = 8;
 
         /* Initialize the the device_attribute structure */
         dev_attr = &ssi_private->dev_attr;
+        sysfs_attr_init(&dev_attr->attr);
         dev_attr->attr.name = "statistics";
         dev_attr->attr.mode = S_IRUGO;
         dev_attr->show = fsl_sysfs_ssi_show;
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index fff695ccdd3..5c6c2457386 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -299,10 +299,11 @@ static struct snd_pcm_ops psc_dma_ops = {
 };
 
 static u64 psc_dma_dmamask = 0xffffffff;
-static int psc_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
-                           struct snd_pcm *pcm)
+static int psc_dma_new(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_pcm_runtime *rtd = pcm->private_data;
+        struct snd_card *card = rtd->card->snd_card;
+        struct snd_soc_dai *dai = rtd->cpu_dai;
+        struct snd_pcm *pcm = rtd->pcm;
         struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(rtd->cpu_dai);
         size_t size = psc_dma_hardware.buffer_bytes_max;
         int rc = 0;
@@ -368,7 +369,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
         .pcm_free       = &psc_dma_free,
 };
 
-static int mpc5200_hpcd_probe(struct of_device *op)
+static int mpc5200_hpcd_probe(struct platform_device *op)
 {
         phys_addr_t fifo;
         struct psc_dma *psc_dma;
@@ -384,7 +385,7 @@ static int mpc5200_hpcd_probe(struct of_device *op)
                 dev_err(&op->dev, "Missing reg property\n");
                 return -ENODEV;
         }
-        regs = ioremap(res.start, 1 + res.end - res.start);
+        regs = ioremap(res.start, resource_size(&res));
         if (!regs) {
                 dev_err(&op->dev, "Could not map registers\n");
                 return -ENODEV;
@@ -486,7 +487,7 @@ out_unmap:
         return ret;
 }
 
-static int mpc5200_hpcd_remove(struct of_device *op)
+static int mpc5200_hpcd_remove(struct platform_device *op)
 {
         struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);
 
@@ -518,7 +519,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
 static struct platform_driver mpc5200_hpcd_of_driver = {
         .probe          = mpc5200_hpcd_probe,
         .remove         = mpc5200_hpcd_remove,
-        .dev = {
+        .driver = {
                 .owner          = THIS_MODULE,
                 .name           = "mpc5200-pcm-audio",
                 .of_match_table    = mpc5200_hpcd_match,
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index c16c6b2eff9..358f0baaf71 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -233,7 +233,7 @@ static int get_parent_cell_index(struct device_node *np)
         if (!iprop)
                 return -1;
 
-        return *iprop;
+        return be32_to_cpup(iprop);
 }
 
 /**
@@ -258,7 +258,7 @@ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len)
         if (!iprop)
                 return -EINVAL;
 
-        addr = *iprop;
+        addr = be32_to_cpup(iprop);
 
         bus = get_parent_cell_index(np);
         if (bus < 0)
@@ -305,7 +305,7 @@ static int get_dma_channel(struct device_node *ssi_np,
                 return -EINVAL;
         }
 
-        *dma_channel_id = *iprop;
+        *dma_channel_id = be32_to_cpup(iprop);
         *dma_id = get_parent_cell_index(dma_channel_np);
         of_node_put(dma_channel_np);
 
@@ -345,8 +345,10 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
         }
 
         machine_data = kzalloc(sizeof(struct mpc8610_hpcd_data), GFP_KERNEL);
-        if (!machine_data)
-                return -ENOMEM;
+        if (!machine_data) {
+                ret = -ENOMEM;
+                goto error_alloc;
+        }
 
         machine_data->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev);
         machine_data->dai[0].ops = &mpc8610_hpcd_ops;
@@ -379,7 +381,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
                 ret = -EINVAL;
                 goto error;
         }
-        machine_data->ssi_id = *iprop;
+        machine_data->ssi_id = be32_to_cpup(iprop);
 
         /* Get the serial format and clock direction. */
         sprop = of_get_property(np, "fsl,mode", NULL);
@@ -405,7 +407,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
                         ret = -EINVAL;
                         goto error;
                 }
-                machine_data->clk_frequency = *iprop;
+                machine_data->clk_frequency = be32_to_cpup(iprop);
         } else if (strcasecmp(sprop, "i2s-master") == 0) {
                 machine_data->dai_format = SND_SOC_DAIFMT_I2S;
                 machine_data->codec_clk_direction = SND_SOC_CLOCK_IN;
@@ -494,7 +496,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
         ret = platform_device_add(sound_device);
         if (ret) {
                 dev_err(&pdev->dev, "platform device add failed\n");
-                goto error;
+                goto error_sound;
         }
         dev_set_drvdata(&pdev->dev, sound_device);
 
@@ -502,14 +504,12 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
 
         return 0;
 
+error_sound:
+        platform_device_unregister(sound_device);
 error:
-        of_node_put(codec_np);
-
-        if (sound_device)
-                platform_device_unregister(sound_device);
-
         kfree(machine_data);
-
+error_alloc:
+        of_node_put(codec_np);
         return ret;
 }
 
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 66e0b68af14..fcb862eb0c7 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -232,7 +232,7 @@ static int get_parent_cell_index(struct device_node *np)
 
         iprop = of_get_property(parent, "cell-index", NULL);
         if (iprop)
-                ret = *iprop;
+                ret = be32_to_cpup(iprop);
 
         of_node_put(parent);
 
@@ -261,7 +261,7 @@ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len)
         if (!iprop)
                 return -EINVAL;
 
-        addr = *iprop;
+        addr = be32_to_cpup(iprop);
 
         bus = get_parent_cell_index(np);
         if (bus < 0)
@@ -297,8 +297,10 @@ static int get_dma_channel(struct device_node *ssi_np,
          * dai->platform name should already point to an allocated buffer.
          */
         ret = of_address_to_resource(dma_channel_np, 0, &res);
-        if (ret)
+        if (ret) {
+                of_node_put(dma_channel_np);
                 return ret;
+        }
         snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s",
                  (unsigned long long) res.start, dma_channel_np->name);
 
@@ -308,7 +310,7 @@ static int get_dma_channel(struct device_node *ssi_np,
                 return -EINVAL;
         }
 
-        *dma_channel_id = *iprop;
+        *dma_channel_id = be32_to_cpup(iprop);
         *dma_id = get_parent_cell_index(dma_channel_np);
         of_node_put(dma_channel_np);
 
@@ -379,7 +381,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
                 ret = -EINVAL;
                 goto error;
         }
-        mdata->ssi_id = *iprop;
+        mdata->ssi_id = be32_to_cpup(iprop);
 
         /* Get the serial format and clock direction. */
         sprop = of_get_property(np, "fsl,mode", NULL);
@@ -405,7 +407,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
                         ret = -EINVAL;
                         goto error;
                 }
-                mdata->clk_frequency = *iprop;
+                mdata->clk_frequency = be32_to_cpup(iprop);
         } else if (strcasecmp(sprop, "i2s-master") == 0) {
                 mdata->dai_format = SND_SOC_DAIFMT_I2S;
                 mdata->codec_clk_direction = SND_SOC_CLOCK_IN;