Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / dma / mv_xor.c

diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 9a353c2216d09a1c1a498da4344f31a03f90aad3..e779b434af450fedc9f11bfc4db753689cce1ee9 100644 (file)
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -1250,7 +1250,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev)
 
 static void
 mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp,
-                        struct mbus_dram_target_info *dram)
+                        const struct mbus_dram_target_info *dram)
 {
        void __iomem *base = msp->xor_base;
        u32 win_enable = 0;
@@ -1264,7 +1264,7 @@ mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp,
        }
 
        for (i = 0; i < dram->num_cs; i++) {
-               struct mbus_dram_window *cs = dram->cs + i;
+               const struct mbus_dram_window *cs = dram->cs + i;
 
                writel((cs->base & 0xffff0000) |
                       (cs->mbus_attr << 8) |
@@ -1290,7 +1290,7 @@ static struct platform_driver mv_xor_driver = {
 
 static int mv_xor_shared_probe(struct platform_device *pdev)
 {
-       struct mv_xor_platform_shared_data *msd = pdev->dev.platform_data;
+       const struct mbus_dram_target_info *dram;
        struct mv_xor_shared_private *msp;
        struct resource *res;
 
@@ -1323,8 +1323,9 @@ static int mv_xor_shared_probe(struct platform_device *pdev)
        /*
         * (Re-)program MBUS remapping windows if we are asked to.
         */
-       if (msd != NULL && msd->dram != NULL)
-               mv_xor_conf_mbus_windows(msp, msd->dram);
+       dram = mv_mbus_dram_info();
+       if (dram)
+               mv_xor_conf_mbus_windows(msp, dram);
 
        return 0;
 }