2 files changed, 11 insertions, 13 deletions

diff --git a/include/sound/saif.h b/include/sound/saif.h
index d0e0de7984ec..f22f3e16edf4 100644
--- a/include/sound/saif.h
+++ b/include/sound/saif.h
@@ -10,7 +10,7 @@
 #define __SOUND_SAIF_H__
 
 struct mxs_saif_platform_data {
-        int (*init) (void);
-        int (*get_master_id) (unsigned int saif_id);
+        bool master_mode;       /* if true use master mode */
+        int master_id;          /* id of the master if in slave mode */
 };
 #endif
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);