Message ID | 20191021105822.20271-7-lee.jones@linaro.org |
---|---|
State | New |
Headers | show |
Series | Simplify MFD Core | expand |
On Mon, Oct 21, 2019 at 11:58:19AM +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> > --- > arch/x86/platform/olpc/olpc-xo1-pm.c | 6 ------ Why doesn't olpc-xo1-sci.c need a similar update. Daniel. > 1 file changed, 6 deletions(-) > > diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/olpc-xo1-pm.c > index e1a32062a375..0fc57b59743c 100644 > --- a/arch/x86/platform/olpc/olpc-xo1-pm.c > +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c > @@ -126,10 +126,6 @@ static int xo1_pm_probe(struct platform_device *pdev) > 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 +148,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..0fc57b59743c 100644 --- a/arch/x86/platform/olpc/olpc-xo1-pm.c +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c @@ -126,10 +126,6 @@ static int xo1_pm_probe(struct platform_device *pdev) 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 +148,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 | 6 ------ 1 file changed, 6 deletions(-) -- 2.17.1