Skip to content

Commit 0cfe013

Browse files
author
Lee Jones
committed
x86: olpc-xo1-pm: Remove invocation of MFD's .enable()/.disable() call-backs
IO regions are now requested and released by this device's parent. Signed-off-by: Lee Jones <[email protected]> Reviewed-by: Daniel Thompson <[email protected]>
1 parent ead1c83 commit 0cfe013

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

arch/x86/platform/olpc/olpc-xo1-pm.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/platform_device.h>
1313
#include <linux/export.h>
1414
#include <linux/pm.h>
15-
#include <linux/mfd/core.h>
1615
#include <linux/suspend.h>
1716
#include <linux/olpc-ec.h>
1817

@@ -120,16 +119,11 @@ static const struct platform_suspend_ops xo1_suspend_ops = {
120119
static int xo1_pm_probe(struct platform_device *pdev)
121120
{
122121
struct resource *res;
123-
int err;
124122

125123
/* don't run on non-XOs */
126124
if (!machine_is_olpc())
127125
return -ENODEV;
128126

129-
err = mfd_cell_enable(pdev);
130-
if (err)
131-
return err;
132-
133127
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
134128
if (!res) {
135129
dev_err(&pdev->dev, "can't fetch device resource info\n");
@@ -152,8 +146,6 @@ static int xo1_pm_probe(struct platform_device *pdev)
152146

153147
static int xo1_pm_remove(struct platform_device *pdev)
154148
{
155-
mfd_cell_disable(pdev);
156-
157149
if (strcmp(pdev->name, "cs5535-pms") == 0)
158150
pms_base = 0;
159151
else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0)

0 commit comments

Comments
 (0)