--- zzzz-none-000/linux-3.10.107/drivers/mfd/mcp-sa11x0.c 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/drivers/mfd/mcp-sa11x0.c 2021-02-04 17:41:59.000000000 +0000 @@ -12,7 +12,6 @@ * MCP read/write timeouts from Jordi Colomer, rehacked by rmk. */ #include -#include #include #include #include @@ -156,7 +155,7 @@ 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 +224,6 @@ if (ret == 0) return 0; - platform_set_drvdata(dev, NULL); - err_ioremap: iounmap(m->base1); iounmap(m->base0); @@ -252,7 +249,6 @@ 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); @@ -303,7 +299,6 @@ .remove = mcp_sa11x0_remove, .driver = { .name = DRIVER_NAME, - .owner = THIS_MODULE, .pm = &mcp_sa11x0_pm_ops, }, };