mirror of https://gitee.com/openkylin/linux.git
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 <lee.jones@linaro.org> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
This commit is contained in:
parent
ead1c83ddd
commit
0cfe013c22
|
@ -12,7 +12,6 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/pm.h>
|
||||
#include <linux/mfd/core.h>
|
||||
#include <linux/suspend.h>
|
||||
#include <linux/olpc-ec.h>
|
||||
|
||||
|
@ -120,16 +119,11 @@ static const struct platform_suspend_ops xo1_suspend_ops = {
|
|||
static int xo1_pm_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct resource *res;
|
||||
int err;
|
||||
|
||||
/* don't run on non-XOs */
|
||||
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 +146,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)
|
||||
|
|
Loading…
Reference in New Issue