summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2019-10-21 14:50:59 +0200
committerLee Jones <lee.jones@linaro.org>2019-11-11 09:45:03 +0100
commit504c3fad8c38d5ff5a16b76c815f51c1aa375586 (patch)
tree4cf27f037a9e5d6e1926ffbeafd9df43a53fcee1 /arch
parentx86: olpc-xo1-pm: Remove invocation of MFD's .enable()/.disable() call-backs (diff)
downloadlinux-504c3fad8c38d5ff5a16b76c815f51c1aa375586.tar.xz
linux-504c3fad8c38d5ff5a16b76c815f51c1aa375586.zip
x86: olpc-xo1-sci: 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 <lee.jones@linaro.org> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/platform/olpc/olpc-xo1-sci.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c
index 99a28ce2244c..933dd4fe3a97 100644
--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -15,7 +15,6 @@
#include <linux/platform_device.h>
#include <linux/pm.h>
#include <linux/pm_wakeup.h>
-#include <linux/mfd/core.h>
#include <linux/power_supply.h>
#include <linux/suspend.h>
#include <linux/workqueue.h>
@@ -537,10 +536,6 @@ static int xo1_sci_probe(struct platform_device *pdev)
if (!machine_is_olpc())
return -ENODEV;
- r = mfd_cell_enable(pdev);
- if (r)
- return r;
-
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!res) {
dev_err(&pdev->dev, "can't fetch device resource info\n");
@@ -605,7 +600,6 @@ err_ebook:
static int xo1_sci_remove(struct platform_device *pdev)
{
- mfd_cell_disable(pdev);
free_irq(sci_irq, pdev);
cancel_work_sync(&sci_work);
free_ec_sci();