| Message ID | 20191024163832.31326-7-lee.jones@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Simplify MFD Core | expand |
On Thu, Oct 24, 2019 at 05:38:28PM +0100, Lee Jones wrote: > IO regions are now requested and released by this device's parent. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> > --- > arch/x86/platform/olpc/olpc-xo1-pm.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/olpc-xo1-pm.c > index e1a32062a375..f067ac780ba7 100644 > --- a/arch/x86/platform/olpc/olpc-xo1-pm.c > +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c > @@ -12,7 +12,6 @@ > #include <linux/platform_device.h> > #include <linux/export.h> > #include <linux/pm.h> > -#include <linux/mfd/core.h> > #include <linux/suspend.h> > #include <linux/olpc-ec.h> > > @@ -120,16 +119,11 @@ static const struct platform_suspend_ops xo1_suspend_ops = { > static int xo1_pm_probe(struct platform_device *pdev) > { > struct resource *res; > - int err; > > /* don't run on non-XOs */ > if (!machine_is_olpc()) > return -ENODEV; > > - err = mfd_cell_enable(pdev); > - if (err) > - return err; > - > res = platform_get_resource(pdev, IORESOURCE_IO, 0); > if (!res) { > dev_err(&pdev->dev, "can't fetch device resource info\n"); > @@ -152,8 +146,6 @@ static int xo1_pm_probe(struct platform_device *pdev) > > static int xo1_pm_remove(struct platform_device *pdev) > { > - mfd_cell_disable(pdev); > - > if (strcmp(pdev->name, "cs5535-pms") == 0) > pms_base = 0; > else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0) > -- > 2.17.1 >
diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/olpc-xo1-pm.c index e1a32062a375..f067ac780ba7 100644 --- a/arch/x86/platform/olpc/olpc-xo1-pm.c +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c @@ -12,7 +12,6 @@ #include <linux/platform_device.h> #include <linux/export.h> #include <linux/pm.h> -#include <linux/mfd/core.h> #include <linux/suspend.h> #include <linux/olpc-ec.h> @@ -120,16 +119,11 @@ static const struct platform_suspend_ops xo1_suspend_ops = { static int xo1_pm_probe(struct platform_device *pdev) { struct resource *res; - int err; /* don't run on non-XOs */ if (!machine_is_olpc()) return -ENODEV; - err = mfd_cell_enable(pdev); - if (err) - return err; - res = platform_get_resource(pdev, IORESOURCE_IO, 0); if (!res) { dev_err(&pdev->dev, "can't fetch device resource info\n"); @@ -152,8 +146,6 @@ static int xo1_pm_probe(struct platform_device *pdev) static int xo1_pm_remove(struct platform_device *pdev) { - mfd_cell_disable(pdev); - if (strcmp(pdev->name, "cs5535-pms") == 0) pms_base = 0; else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0)
IO regions are now requested and released by this device's parent. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- arch/x86/platform/olpc/olpc-xo1-pm.c | 8 -------- 1 file changed, 8 deletions(-) -- 2.17.1