Re: [PATCH v2 6/7] ARM: OMAP3: Use .teardown of twl4030-gpio to clean board requests

2012-02-23 Thread Igor Grinberg 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Rajendra,

On 02/23/12 13:40, Rajendra Nayak wrote:
 All OMAP3 boards which register a .setup function with twl4030
 gpio driver do not seem to have a .teardown hook implemented.
 .setup mainly requests a few gpios and also in most cases
 does a omap_hsmmc_deferred_add(). Have a .teardown do a gpio_free()
 and of the requested gpios and also do a omap_hsmmc_deferred_del().
 This helps in case the twl4030 gpio driver is built as a module and
 added and removed multiple times. Without the .teardown a multiple
 insmod/rmmod can result in gpio request failues and also WARN messages
 stating addition of already registered mmc devices.
 
 Reported-by: Russell King rmk+ker...@arm.linux.org.uk
 Signed-off-by: Rajendra Nayak rna...@ti.com
 ---
  arch/arm/mach-omap2/board-3430sdp.c  |   10 ++
  arch/arm/mach-omap2/board-cm-t35.c   |8 
  arch/arm/mach-omap2/board-devkit8000.c   |   10 ++
  arch/arm/mach-omap2/board-igep0020.c |   14 ++
  arch/arm/mach-omap2/board-ldp.c  |9 +
  arch/arm/mach-omap2/board-omap3beagle.c  |   12 
  arch/arm/mach-omap2/board-omap3evm.c |   10 ++
  arch/arm/mach-omap2/board-omap3pandora.c |9 +
  arch/arm/mach-omap2/board-omap3stalker.c |   11 +++
  arch/arm/mach-omap2/board-omap3touchbook.c   |   10 ++
  arch/arm/mach-omap2/board-overo.c|8 
  arch/arm/mach-omap2/board-rx51-peripherals.c |8 
  arch/arm/mach-omap2/board-zoom-peripherals.c |9 +
  arch/arm/mach-omap2/hsmmc.c  |   11 +++
  arch/arm/mach-omap2/hsmmc.h  |4 
  15 files changed, 143 insertions(+), 0 deletions(-)

[...]

 diff --git a/arch/arm/mach-omap2/board-cm-t35.c 
 b/arch/arm/mach-omap2/board-cm-t35.c
 index 14df109..55e0180 100644
 --- a/arch/arm/mach-omap2/board-cm-t35.c
 +++ b/arch/arm/mach-omap2/board-cm-t35.c
 @@ -475,11 +475,19 @@ static int cm_t35_twl_gpio_setup(struct device *dev, 
 unsigned gpio,
   return 0;
  }
  
 +static int cm_t35_twl_gpio_teardown(struct device *dev, unsigned gpio,
 +  unsigned ngpio)
 +{
 + omap_hsmmc_deferred_del(mmc);
 + gpio_free(gpio + 2);
 + return 0;
 +}

Can we have an empty line here?

  static struct twl4030_gpio_platform_data cm_t35_gpio_data = {
   .gpio_base  = OMAP_MAX_GPIO_LINES,
   .irq_base   = TWL4030_GPIO_IRQ_BASE,
   .irq_end= TWL4030_GPIO_IRQ_END,
   .setup  = cm_t35_twl_gpio_setup,
 + .teardown   = cm_t35_twl_gpio_teardown,
  };
  
  static struct twl4030_platform_data cm_t35_twldata = {

[...]

 diff --git a/arch/arm/mach-omap2/board-igep0020.c 
 b/arch/arm/mach-omap2/board-igep0020.c
 index 11a6aa4..1d0850f 100644
 --- a/arch/arm/mach-omap2/board-igep0020.c
 +++ b/arch/arm/mach-omap2/board-igep0020.c
 @@ -435,12 +435,26 @@ static int igep_twl_gpio_setup(struct device *dev,
   return 0;
  };
  
 +static int igep_twl_gpio_teardown(struct device *dev,
 + unsigned gpio, unsigned ngpio)
 +{
 + omap_hsmmc_deferred_del(mmc);
 + gpio_free(gpio + TWL4030_GPIO_MAX + 1);
 + if (machine_is_igep0030())
 + return 0;
 +
 + gpio_free(gpio + 1);
 + gpio_free(gpio + TWL4030_GPIO_MAX);

gpio_free_array()?

 + return 0;
 +}
 +
  static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = {
   .gpio_base  = OMAP_MAX_GPIO_LINES,
   .irq_base   = TWL4030_GPIO_IRQ_BASE,
   .irq_end= TWL4030_GPIO_IRQ_END,
   .use_leds   = true,
   .setup  = igep_twl_gpio_setup,
 + .teardown   = igep_twl_gpio_teardown,
  };
  
  static int igep2_enable_dvi(struct omap_dss_device *dssdev)

[...]

 diff --git a/arch/arm/mach-omap2/board-overo.c 
 b/arch/arm/mach-omap2/board-overo.c
 index 8b6065b..e1f496d 100644
 --- a/arch/arm/mach-omap2/board-overo.c
 +++ b/arch/arm/mach-omap2/board-overo.c
 @@ -419,12 +419,20 @@ static int overo_twl_gpio_setup(struct device *dev,
   return 0;
  }
  
 +static int overo_twl_gpio_teardown(struct device *dev,
 + unsigned gpio, unsigned ngpio)
 +{
 + omap_hsmmc_deferred_del(mmc);

If Overo will not have omap_hsmmc_deferred_add() (as for my comment to
the previous patch), then no need for the omap_hsmmc_deferred_del().

 + return 0;
 +}
 +
  static struct twl4030_gpio_platform_data overo_gpio_data = {
   .gpio_base  = OMAP_MAX_GPIO_LINES,
   .irq_base   = TWL4030_GPIO_IRQ_BASE,
   .irq_end= TWL4030_GPIO_IRQ_END,
   .use_leds   = true,
   .setup  = overo_twl_gpio_setup,
 + .teardown   = overo_twl_gpio_teardown,
  };
  
  static struct regulator_init_data overo_vmmc1 = {

[...]

 diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
 index 51e3a2d..0f256ca 100644
 ---

Re: [PATCH v2 6/7] ARM: OMAP3: Use .teardown of twl4030-gpio to clean board requests

2012-02-23 Thread Rajendra Nayak 

Igor,

On Thursday 23 February 2012 08:25 PM, Igor Grinberg wrote:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Rajendra,

On 02/23/12 13:40, Rajendra Nayak wrote:

All OMAP3 boards which register a .setup function with twl4030
gpio driver do not seem to have a .teardown hook implemented.
.setup mainly requests a few gpios and also in most cases
does a omap_hsmmc_deferred_add(). Have a .teardown do a gpio_free()
and of the requested gpios and also do a omap_hsmmc_deferred_del().
This helps in case the twl4030 gpio driver is built as a module and
added and removed multiple times. Without the .teardown a multiple
insmod/rmmod can result in gpio request failues and also WARN messages
stating addition of already registered mmc devices.


Thanks for the review. I'll take care of all your comments in the next
spin.

regards,
Rajendra



Reported-by: Russell Kingrmk+ker...@arm.linux.org.uk
Signed-off-by: Rajendra Nayakrna...@ti.com
---
  arch/arm/mach-omap2/board-3430sdp.c  |   10 ++
  arch/arm/mach-omap2/board-cm-t35.c   |8 
  arch/arm/mach-omap2/board-devkit8000.c   |   10 ++
  arch/arm/mach-omap2/board-igep0020.c |   14 ++
  arch/arm/mach-omap2/board-ldp.c  |9 +
  arch/arm/mach-omap2/board-omap3beagle.c  |   12 
  arch/arm/mach-omap2/board-omap3evm.c |   10 ++
  arch/arm/mach-omap2/board-omap3pandora.c |9 +
  arch/arm/mach-omap2/board-omap3stalker.c |   11 +++
  arch/arm/mach-omap2/board-omap3touchbook.c   |   10 ++
  arch/arm/mach-omap2/board-overo.c|8 
  arch/arm/mach-omap2/board-rx51-peripherals.c |8 
  arch/arm/mach-omap2/board-zoom-peripherals.c |9 +
  arch/arm/mach-omap2/hsmmc.c  |   11 +++
  arch/arm/mach-omap2/hsmmc.h  |4 
  15 files changed, 143 insertions(+), 0 deletions(-)


[...]


diff --git a/arch/arm/mach-omap2/board-cm-t35.c 
b/arch/arm/mach-omap2/board-cm-t35.c
index 14df109..55e0180 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -475,11 +475,19 @@ static int cm_t35_twl_gpio_setup(struct device *dev, 
unsigned gpio,
return 0;
  }

+static int cm_t35_twl_gpio_teardown(struct device *dev, unsigned gpio,
+unsigned ngpio)
+{
+   omap_hsmmc_deferred_del(mmc);
+   gpio_free(gpio + 2);
+   return 0;
+}


Can we have an empty line here?


  static struct twl4030_gpio_platform_data cm_t35_gpio_data = {
.gpio_base  = OMAP_MAX_GPIO_LINES,
.irq_base   = TWL4030_GPIO_IRQ_BASE,
.irq_end= TWL4030_GPIO_IRQ_END,
.setup  = cm_t35_twl_gpio_setup,
+   .teardown   = cm_t35_twl_gpio_teardown,
  };

  static struct twl4030_platform_data cm_t35_twldata = {


[...]


diff --git a/arch/arm/mach-omap2/board-igep0020.c 
b/arch/arm/mach-omap2/board-igep0020.c
index 11a6aa4..1d0850f 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -435,12 +435,26 @@ static int igep_twl_gpio_setup(struct device *dev,
return 0;
  };

+static int igep_twl_gpio_teardown(struct device *dev,
+   unsigned gpio, unsigned ngpio)
+{
+   omap_hsmmc_deferred_del(mmc);
+   gpio_free(gpio + TWL4030_GPIO_MAX + 1);
+   if (machine_is_igep0030())
+   return 0;
+
+   gpio_free(gpio + 1);
+   gpio_free(gpio + TWL4030_GPIO_MAX);


gpio_free_array()?


+   return 0;
+}
+
  static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = {
.gpio_base  = OMAP_MAX_GPIO_LINES,
.irq_base   = TWL4030_GPIO_IRQ_BASE,
.irq_end= TWL4030_GPIO_IRQ_END,
.use_leds   = true,
.setup  = igep_twl_gpio_setup,
+   .teardown   = igep_twl_gpio_teardown,
  };

  static int igep2_enable_dvi(struct omap_dss_device *dssdev)


[...]


diff --git a/arch/arm/mach-omap2/board-overo.c 
b/arch/arm/mach-omap2/board-overo.c
index 8b6065b..e1f496d 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -419,12 +419,20 @@ static int overo_twl_gpio_setup(struct device *dev,
return 0;
  }

+static int overo_twl_gpio_teardown(struct device *dev,
+   unsigned gpio, unsigned ngpio)
+{
+   omap_hsmmc_deferred_del(mmc);


If Overo will not have omap_hsmmc_deferred_add() (as for my comment to
the previous patch), then no need for the omap_hsmmc_deferred_del().


+   return 0;
+}
+
  static struct twl4030_gpio_platform_data overo_gpio_data = {
.gpio_base  = OMAP_MAX_GPIO_LINES,
.irq_base   = TWL4030_GPIO_IRQ_BASE,
.irq_end= TWL4030_GPIO_IRQ_END,
.use_leds   = true,
.setup  = overo_twl_gpio_setup,
+   .teardown   = overo_twl_gpio_teardown,
  };

  static struct

[PATCH v2 6/7] ARM: OMAP3: Use .teardown of twl4030-gpio to clean board requests

2012-02-23 Thread Rajendra Nayak 
All OMAP3 boards which register a .setup function with twl4030
gpio driver do not seem to have a .teardown hook implemented.
.setup mainly requests a few gpios and also in most cases
does a omap_hsmmc_deferred_add(). Have a .teardown do a gpio_free()
and of the requested gpios and also do a omap_hsmmc_deferred_del().
This helps in case the twl4030 gpio driver is built as a module and
added and removed multiple times. Without the .teardown a multiple
insmod/rmmod can result in gpio request failues and also WARN messages
stating addition of already registered mmc devices.

Reported-by: Russell King rmk+ker...@arm.linux.org.uk
Signed-off-by: Rajendra Nayak rna...@ti.com
---
 arch/arm/mach-omap2/board-3430sdp.c  |   10 ++
 arch/arm/mach-omap2/board-cm-t35.c   |8 
 arch/arm/mach-omap2/board-devkit8000.c   |   10 ++
 arch/arm/mach-omap2/board-igep0020.c |   14 ++
 arch/arm/mach-omap2/board-ldp.c  |9 +
 arch/arm/mach-omap2/board-omap3beagle.c  |   12 
 arch/arm/mach-omap2/board-omap3evm.c |   10 ++
 arch/arm/mach-omap2/board-omap3pandora.c |9 +
 arch/arm/mach-omap2/board-omap3stalker.c |   11 +++
 arch/arm/mach-omap2/board-omap3touchbook.c   |   10 ++
 arch/arm/mach-omap2/board-overo.c|8 
 arch/arm/mach-omap2/board-rx51-peripherals.c |8 
 arch/arm/mach-omap2/board-zoom-peripherals.c |9 +
 arch/arm/mach-omap2/hsmmc.c  |   11 +++
 arch/arm/mach-omap2/hsmmc.h  |4 
 15 files changed, 143 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-3430sdp.c 
b/arch/arm/mach-omap2/board-3430sdp.c
index f93bb84..c1ddbb7 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -259,6 +259,15 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
return 0;
 }
 
+static int sdp3430_twl_gpio_teardown(struct device *dev,
+   unsigned gpio, unsigned ngpio)
+{
+   omap_hsmmc_deferred_del(mmc);
+   gpio_free(gpio + 7);
+   gpio_free(gpio + 15);
+   return 0;
+}
+
 static struct twl4030_gpio_platform_data sdp3430_gpio_data = {
.gpio_base  = OMAP_MAX_GPIO_LINES,
.irq_base   = TWL4030_GPIO_IRQ_BASE,
@@ -266,6 +275,7 @@ static struct twl4030_gpio_platform_data sdp3430_gpio_data 
= {
.pulldowns  = BIT(2) | BIT(6) | BIT(8) | BIT(13)
| BIT(16) | BIT(17),
.setup  = sdp3430_twl_gpio_setup,
+   .teardown   = sdp3430_twl_gpio_teardown,
 };
 
 /* regulator consumer mappings */
diff --git a/arch/arm/mach-omap2/board-cm-t35.c 
b/arch/arm/mach-omap2/board-cm-t35.c
index 14df109..55e0180 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -475,11 +475,19 @@ static int cm_t35_twl_gpio_setup(struct device *dev, 
unsigned gpio,
return 0;
 }
 
+static int cm_t35_twl_gpio_teardown(struct device *dev, unsigned gpio,
+unsigned ngpio)
+{
+   omap_hsmmc_deferred_del(mmc);
+   gpio_free(gpio + 2);
+   return 0;
+}
 static struct twl4030_gpio_platform_data cm_t35_gpio_data = {
.gpio_base  = OMAP_MAX_GPIO_LINES,
.irq_base   = TWL4030_GPIO_IRQ_BASE,
.irq_end= TWL4030_GPIO_IRQ_END,
.setup  = cm_t35_twl_gpio_setup,
+   .teardown   = cm_t35_twl_gpio_teardown,
 };
 
 static struct twl4030_platform_data cm_t35_twldata = {
diff --git a/arch/arm/mach-omap2/board-devkit8000.c 
b/arch/arm/mach-omap2/board-devkit8000.c
index 6b99a5e..2903dd1 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -254,6 +254,15 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
return 0;
 }
 
+static int devkit8000_twl_gpio_teardown(struct device *dev,
+   unsigned gpio, unsigned ngpio)
+{
+   omap_hsmmc_deferred_del(mmc);
+   gpio_free(gpio + TWL4030_GPIO_MAX + 0);
+   gpio_free(gpio + 7);
+   return 0;
+}
+
 static struct twl4030_gpio_platform_data devkit8000_gpio_data = {
.gpio_base  = OMAP_MAX_GPIO_LINES,
.irq_base   = TWL4030_GPIO_IRQ_BASE,
@@ -262,6 +271,7 @@ static struct twl4030_gpio_platform_data 
devkit8000_gpio_data = {
.pulldowns  = BIT(1) | BIT(2) | BIT(6) | BIT(8) | BIT(13)
| BIT(15) | BIT(16) | BIT(17),
.setup  = devkit8000_twl_gpio_setup,
+   .teardown   = devkit8000_twl_gpio_teardown,
 };
 
 static struct regulator_consumer_supply devkit8000_vpll1_supplies[] = {
diff --git a/arch/arm/mach-omap2/board-igep0020.c 
b/arch/arm/mach-omap2/board-igep0020.c
index 11a6aa4..1d0850f 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -435,12 +435,26 @@ static int