diff mbox series

[v3,07/10] x86: olpc-xo1-sci: Remove invocation of MFD's .enable()/.disable() call-backs

Message ID 20191024163832.31326-8-lee.jones@linaro.org
State Superseded
Headers show
Series Simplify MFD Core | expand

Commit Message

Lee Jones Oct. 24, 2019, 4:38 p.m. UTC
IO regions are now requested and released by this device's parent.

Signed-off-by: Lee Jones <lee.jones@linaro.org>

---
 arch/x86/platform/olpc/olpc-xo1-sci.c | 6 ------
 1 file changed, 6 deletions(-)

-- 
2.17.1

Comments

Daniel Thompson Oct. 25, 2019, 8:54 a.m. UTC | #1
On Thu, Oct 24, 2019 at 05:38:29PM +0100, Lee Jones wrote:
> 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>


> ---

>  arch/x86/platform/olpc/olpc-xo1-sci.c | 6 ------

>  1 file changed, 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 @@ static int xo1_sci_probe(struct platform_device *pdev)

>  

>  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();

> -- 

> 2.17.1

>
diff mbox series

Patch

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 @@  static int xo1_sci_probe(struct platform_device *pdev)
 
 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();