Skip to contentSkip to conversation

hwmon: (max6650) Allow setting of fan voltage

PATCH In review Mark Ware 2 participants 2 messages Nov 25, 2009

Subsystems (2)
lore
Share & tools
lore

Mark Ware

author
#0 lore raw

PATCH 1/1 hwmon: (max6650) Allow setting of fan voltage

The current way to set fan voltage and prescaler parameters is system-wide via module parameters. This patch allows them to be set on a per chip basis using platform_data. If no platform data is provided, the existing behaviour is maintained.

---
 drivers/hwmon/max6650.c |   88 +++++++++++++++++++++++++----------------------
 1 files changed, 47 insertions(+), 41 deletions(-)
drivers/hwmon/max6650.c +47 -41
index 58f66be..2e8ab9e 100644
@@ -635,52 +635,58 @@ static int max6650_init_client(struct i2c_client *client)
 		return err;
 	}
 
-	switch (fan_voltage) {
-		case 0:
-			break;
-		case 5:
-			config &= ~MAX6650_CFG_V12;
-			break;
-		case 12:
-			config |= MAX6650_CFG_V12;
-			break;
-		default:
-			dev_err(&client->dev,
-				"illegal value for fan_voltage (%d)\n",
-				fan_voltage);
+	if (client->dev.platform_data) {
+		config = *(u8 *)client->dev.platform_data;
+	}
+	else
+	{
+		switch (fan_voltage) {
+			case 0:
+				break;
+			case 5:
+				config &= ~MAX6650_CFG_V12;
+				break;
+			case 12:
+				config |= MAX6650_CFG_V12;
+				break;
+			default:
+				dev_err(&client->dev,
+					"illegal value for fan_voltage (%d)\n",
+					fan_voltage);
+		}
+
+		switch (prescaler) {
+			case 0:
+				break;
+			case 1:
+				config &= ~MAX6650_CFG_PRESCALER_MASK;
+				break;
+			case 2:
+				config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+					 | MAX6650_CFG_PRESCALER_2;
+				break;
+			case  4:
+				config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+					 | MAX6650_CFG_PRESCALER_4;
+				break;
+			case  8:
+				config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+					 | MAX6650_CFG_PRESCALER_8;
+				break;
+			case 16:
+				config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+					 | MAX6650_CFG_PRESCALER_16;
+				break;
+			default:
+				dev_err(&client->dev,
+					"illegal value for prescaler (%d)\n",
+					prescaler);
+		}
 	}
 
 	dev_info(&client->dev, "Fan voltage is set to %dV.\n",
 		 (config & MAX6650_CFG_V12) ? 12 : 5);
 
-	switch (prescaler) {
-		case 0:
-			break;
-		case 1:
-			config &= ~MAX6650_CFG_PRESCALER_MASK;
-			break;
-		case 2:
-			config = (config & ~MAX6650_CFG_PRESCALER_MASK)
-				 | MAX6650_CFG_PRESCALER_2;
-			break;
-		case  4:
-			config = (config & ~MAX6650_CFG_PRESCALER_MASK)
-				 | MAX6650_CFG_PRESCALER_4;
-			break;
-		case  8:
-			config = (config & ~MAX6650_CFG_PRESCALER_MASK)
-				 | MAX6650_CFG_PRESCALER_8;
-			break;
-		case 16:
-			config = (config & ~MAX6650_CFG_PRESCALER_MASK)
-				 | MAX6650_CFG_PRESCALER_16;
-			break;
-		default:
-			dev_err(&client->dev,
-				"illegal value for prescaler (%d)\n",
-				prescaler);
-	}
-
 	dev_info(&client->dev, "Prescaler is set to %d.\n",
 		 1 << (config & MAX6650_CFG_PRESCALER_MASK));
 
Signature · 7 lines
1.5.6.5


_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#1 lore raw

Re: [lm-sensors] [PATCH] hwmon: (max6650) Allow setting of fan

Quoted 21 lines · Mark Ware

The current way to set fan voltage and prescaler parameters is system-wide via module parameters. This patch allows them to be set on a per chip basis using platform_data. If no platform data is provided, the existing behaviour is maintained.

---
 drivers/hwmon/max6650.c |   88 +++++++++++++++++++++++++----------------------
 1 files changed, 47 insertions(+), 41 deletions(-)
drivers/hwmon/max6650.c +0 -5
index 58f66be..2e8ab9e 100644
@@ -635,52 +635,58 @@ static int max6650_init_client(struct i2c_client *client)
 		return err;
 	}
 
-	switch (fan_voltage) {
-		case 0:
-			break;
-		case 5:
-			config &= ~MAX6650_CFG_V12;

drivers/hwmon/max6650.c static int max6650_init_client(struct i2c_client *client) · line 639

Quoted 10 lines
drivers/hwmon/max6650.c +2 -8
-			break;
-		case 12:
-			config |= MAX6650_CFG_V12;
-			break;
-		default:
-			dev_err(&client->dev,
-				"illegal value for fan_voltage (%d)\n",
-				fan_voltage);
+	if (client->dev.platform_data) {
+		config = *(u8 *)client->dev.platform_data;

This silently ignores errors in that platform data. I'd find it better to have some struct max6650_platform_data, containing an element "fan_voltage". Then you can run the given value through the same switch below, checking errors. Furthermore, the struct offers room for future extensions.

drivers/hwmon/max6650.c static int max6650_init_client(struct i2c_client *client) · line 642

Quoted 3 lines
drivers/hwmon/max6650.c +3 -0
+	}
+	else
+	{

Make this } else { in one line

Thanks,
Hans

Quoted 80 lines
drivers/hwmon/max6650.c +42 -28
+		switch (fan_voltage) {
+			case 0:
+				break;
+			case 5:
+				config &= ~MAX6650_CFG_V12;
+				break;
+			case 12:
+				config |= MAX6650_CFG_V12;
+				break;
+			default:
+				dev_err(&client->dev,
+					"illegal value for fan_voltage (%d)\n",
+					fan_voltage);
+		}
+
+		switch (prescaler) {
+			case 0:
+				break;
+			case 1:
+				config &= ~MAX6650_CFG_PRESCALER_MASK;
+				break;
+			case 2:
+				config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+					 | MAX6650_CFG_PRESCALER_2;
+				break;
+			case  4:
+				config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+					 | MAX6650_CFG_PRESCALER_4;
+				break;
+			case  8:
+				config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+					 | MAX6650_CFG_PRESCALER_8;
+				break;
+			case 16:
+				config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+					 | MAX6650_CFG_PRESCALER_16;
+				break;
+			default:
+				dev_err(&client->dev,
+					"illegal value for prescaler (%d)\n",
+					prescaler);
+		}
 	}
 
 	dev_info(&client->dev, "Fan voltage is set to %dV.\n",
 		 (config & MAX6650_CFG_V12) ? 12 : 5);
 
-	switch (prescaler) {
-		case 0:
-			break;
-		case 1:
-			config &= ~MAX6650_CFG_PRESCALER_MASK;
-			break;
-		case 2:
-			config = (config & ~MAX6650_CFG_PRESCALER_MASK)
-				 | MAX6650_CFG_PRESCALER_2;
-			break;
-		case  4:
-			config = (config & ~MAX6650_CFG_PRESCALER_MASK)
-				 | MAX6650_CFG_PRESCALER_4;
-			break;
-		case  8:
-			config = (config & ~MAX6650_CFG_PRESCALER_MASK)
-				 | MAX6650_CFG_PRESCALER_8;
-			break;
-		case 16:
-			config = (config & ~MAX6650_CFG_PRESCALER_MASK)
-				 | MAX6650_CFG_PRESCALER_16;
-			break;
-		default:
-			dev_err(&client->dev,
-				"illegal value for prescaler (%d)\n",
-				prescaler);
-	}
-
 	dev_info(&client->dev, "Prescaler is set to %d.\n",
 		 1 << (config & MAX6650_CFG_PRESCALER_MASK));
 
Signature · 1 line
1.5.6.5

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors