Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / mcp-sa11x0.c

diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index f99d6299ec246bb5c4814e3d1af3d96c8ec36394..41c31b3ac94059e4dacf21565d3d411cd37da371 100644 (file)
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -156,7 +156,7 @@ static struct mcp_ops mcp_sa11x0 = {
 
 static int mcp_sa11x0_probe(struct platform_device *dev)
 {
-       struct mcp_plat_data *data = dev->dev.platform_data;
+       struct mcp_plat_data *data = dev_get_platdata(&dev->dev);
        struct resource *mem0, *mem1;
        struct mcp_sa11x0 *m;
        struct mcp *mcp;
@@ -225,8 +225,6 @@ static int mcp_sa11x0_probe(struct platform_device *dev)
        if (ret == 0)
                return 0;
 
-       platform_set_drvdata(dev, NULL);
-
  err_ioremap:
        iounmap(m->base1);
        iounmap(m->base0);
@@ -252,7 +250,6 @@ static int mcp_sa11x0_remove(struct platform_device *dev)
        mem0 = platform_get_resource(dev, IORESOURCE_MEM, 0);
        mem1 = platform_get_resource(dev, IORESOURCE_MEM, 1);
 
-       platform_set_drvdata(dev, NULL);
        mcp_host_del(mcp);
        iounmap(m->base1);
        iounmap(m->base0);