Skip to contentSkip to conversation

staging: olpc_dcon: remove noinit module variable

PATCH In review Andres Salomon 2 participants 3 messages Jul 22, 2011 – Aug 18, 2011 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 staging: olpc_dcon: remove noinit module variable

This came from Jordan's original 2007 gxfb_dcon commit. I've never seen or heard of it actually being used. Presumably it was once useful for skipping hardware initialization when reloading the module over and over during driver development..

---
 drivers/staging/olpc_dcon/olpc_dcon.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/staging/olpc_dcon/olpc_dcon.c +2 -5
index 750fe50..cf4b454 100644
@@ -36,9 +36,6 @@
 static int resumeline = 898;
 module_param(resumeline, int, 0444);
 
-static int noinit;
-module_param(noinit, int, 0444);
-
 /* Default off since it doesn't work on DCON ASIC in B-test OLPC board */
 static int useaa = 1;
 module_param(useaa, int, 0444);
@@ -90,7 +87,7 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
 		}
 	}
 
-	if (ver < 0xdc02 && !noinit) {
+	if (ver < 0xdc02) {
 		/* Initialize the DCON registers */
 
 		/* Start with work-arounds for DCON ASIC */
@@ -106,7 +103,7 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
 		i2c_smbus_write_word_data(client, 0x3b, 0x002b);
 		i2c_smbus_write_word_data(client, 0x41, 0x0101);
 		i2c_smbus_write_word_data(client, 0x42, 0x0101);
-	} else if (!noinit) {
+	} else {
 		/* SDRAM setup/hold time */
 		i2c_smbus_write_word_data(client, 0x3a, 0xc040);
 		i2c_smbus_write_word_data(client, 0x41, 0x0000);
Signature · 1 line
1.7.2.5
#1 lore raw

Hi Greg,

Did you see these? I haven't seen any emails about them being merged into the staging tree yet..

Quoted 42 lines · On Thu, 21 Jul 2011 20:37:43 -0700 Andres Salomon <[email protected]> wrote:

This came from Jordan's original 2007 gxfb_dcon commit. I've never seen or heard of it actually being used. Presumably it was once useful for skipping hardware initialization when reloading the module over and over during driver development..

---
 drivers/staging/olpc_dcon/olpc_dcon.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/olpc_dcon/olpc_dcon.c index 750fe50..cf4b454 100644

drivers/staging/olpc_dcon/olpc_dcon.c +2 -5
@@ -36,9 +36,6 @@
 static int resumeline = 898;
 module_param(resumeline, int, 0444);
 
-static int noinit;
-module_param(noinit, int, 0444);
-
 /* Default off since it doesn't work on DCON ASIC in B-test OLPC
 board */ static int useaa = 1;
 module_param(useaa, int, 0444);
@@ -90,7 +87,7 @@ static int dcon_hw_init(struct dcon_priv *dcon, int
 is_init) }
 	}
 
-	if (ver < 0xdc02 && !noinit) {
+	if (ver < 0xdc02) {
 		/* Initialize the DCON registers */
 
 		/* Start with work-arounds for DCON ASIC */
@@ -106,7 +103,7 @@ static int dcon_hw_init(struct dcon_priv *dcon,
 int is_init) i2c_smbus_write_word_data(client, 0x3b, 0x002b);
 		i2c_smbus_write_word_data(client, 0x41, 0x0101);
 		i2c_smbus_write_word_data(client, 0x42, 0x0101);
-	} else if (!noinit) {
+	} else {
 		/* SDRAM setup/hold time */
 		i2c_smbus_write_word_data(client, 0x3a, 0xc040);
 		i2c_smbus_write_word_data(client, 0x41, 0x0000);
#2 lore raw
Quoted 4 lines · Andres Salomon

Hi Greg,

Did you see these? I haven't seen any emails about them being merged into the staging tree yet..

Yes, sorry, lots of travel, merge windows, and conferences. I'll get to these next week when I return from LinuxCon.

thanks for your patience,

greg k-h