Skip to content

Commit 504c3fa

Browse files
author
Lee Jones
committed
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 <[email protected]> Reviewed-by: Daniel Thompson <[email protected]>
1 parent 0cfe013 commit 504c3fa

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/platform_device.h>
1616
#include <linux/pm.h>
1717
#include <linux/pm_wakeup.h>
18-
#include <linux/mfd/core.h>
1918
#include <linux/power_supply.h>
2019
#include <linux/suspend.h>
2120
#include <linux/workqueue.h>
@@ -537,10 +536,6 @@ static int xo1_sci_probe(struct platform_device *pdev)
537536
if (!machine_is_olpc())
538537
return -ENODEV;
539538

540-
r = mfd_cell_enable(pdev);
541-
if (r)
542-
return r;
543-
544539
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
545540
if (!res) {
546541
dev_err(&pdev->dev, "can't fetch device resource info\n");
@@ -605,7 +600,6 @@ static int xo1_sci_probe(struct platform_device *pdev)
605600

606601
static int xo1_sci_remove(struct platform_device *pdev)
607602
{
608-
mfd_cell_disable(pdev);
609603
free_irq(sci_irq, pdev);
610604
cancel_work_sync(&sci_work);
611605
free_ec_sci();

0 commit comments

Comments
 (0)