Commit 504c3fad authored by Lee Jones's avatar Lee Jones

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: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
parent 0cfe013c
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/pm_wakeup.h> #include <linux/pm_wakeup.h>
#include <linux/mfd/core.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
...@@ -537,10 +536,6 @@ static int xo1_sci_probe(struct platform_device *pdev) ...@@ -537,10 +536,6 @@ static int xo1_sci_probe(struct platform_device *pdev)
if (!machine_is_olpc()) if (!machine_is_olpc())
return -ENODEV; return -ENODEV;
r = mfd_cell_enable(pdev);
if (r)
return r;
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!res) { if (!res) {
dev_err(&pdev->dev, "can't fetch device resource info\n"); dev_err(&pdev->dev, "can't fetch device resource info\n");
...@@ -605,7 +600,6 @@ static int xo1_sci_probe(struct platform_device *pdev) ...@@ -605,7 +600,6 @@ static int xo1_sci_probe(struct platform_device *pdev)
static int xo1_sci_remove(struct platform_device *pdev) static int xo1_sci_remove(struct platform_device *pdev)
{ {
mfd_cell_disable(pdev);
free_irq(sci_irq, pdev); free_irq(sci_irq, pdev);
cancel_work_sync(&sci_work); cancel_work_sync(&sci_work);
free_ec_sci(); free_ec_sci();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment