Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Driver specific changes

Again, a lot of platforms have changes in here: pxa, samsung, omap,
at91, imx, ...

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  ARM: sa1100: clean up of the clock support
  ARM: pxa: add dummy clock for sa1100-rtc
  RTC: sa1100: support sa1100, pxa and mmp soc families
  RTC: sa1100: remove redundant code of setting alarm
  RTC: sa1100: Clean out ost register
  Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
  ARM: EXYNOS: Modified files for SPI consolidation work
  ARM: S5P64X0: Enable SDHCI support
  ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
  ARM: S5P64X0: Add HSMMC setup for host Controller
  ARM: EXYNOS: Add USB OHCI support to ORIGEN board
  USB: Add Samsung Exynos OHCI diver
  ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
  ARM: EXYNOS: Add USB OHCI device
  net: macb: fix build break with !CONFIG_OF
  i2c: tegra: Support DVC controller in device tree
  i2c: tegra: Add __devinit/exit to probe/remove
  net/at91_ether: use gpio_is_valid for phy IRQ line
  ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT
  ...

1 files changed, 9 insertions, 11 deletions

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 76dc74d24fc2..1ef697fe1731 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -625,13 +625,6 @@ static int mxs_saif_probe(struct platform_device *pdev)
         if (pdev->id >= ARRAY_SIZE(mxs_saif))
                 return -EINVAL;
 
-        pdata = pdev->dev.platform_data;
-        if (pdata && pdata->init) {
-                ret = pdata->init();
-                if (ret)
-                        return ret;
-        }
-
         saif = kzalloc(sizeof(*saif), GFP_KERNEL);
         if (!saif)
                 return -ENOMEM;
@@ -639,12 +632,17 @@ static int mxs_saif_probe(struct platform_device *pdev)
         mxs_saif[pdev->id] = saif;
         saif->id = pdev->id;
 
-        saif->master_id = saif->id;
-        if (pdata && pdata->get_master_id) {
-                saif->master_id = pdata->get_master_id(saif->id);
+        pdata = pdev->dev.platform_data;
+        if (pdata && !pdata->master_mode) {
+                saif->master_id = pdata->master_id;
                 if (saif->master_id < 0 ||
-                        saif->master_id >= ARRAY_SIZE(mxs_saif))
+                        saif->master_id >= ARRAY_SIZE(mxs_saif) ||
+                        saif->master_id == saif->id) {
+                        dev_err(&pdev->dev, "get wrong master id\n");
                         return -EINVAL;
+                }
+        } else {
+                saif->master_id = saif->id;
         }
 
         saif->clk = clk_get(&pdev->dev, NULL);