Skip to content

Commit

Permalink
hwmon: (lm85) Misc cleanups
Browse files Browse the repository at this point in the history 
Misc cleanups to the lm85 hardware monitoring driver:
* Mark constant arrays as const.
* Remove useless masks.
* Have lm85_write_value return void - nobody is checking the returned
  value anyway and in some cases it was plain wrong.
* Remove useless initializations.
* Rename new_client to client in lm85_detect.
* Replace cascaded if/else with a switch/case in lm85_detect.
* Group similar loops in lm85_update_device.
* Remove legacy comments.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
  • Loading branch information
Jean Delvare authored and Mark M. Hoffman committed Aug 1, 2008
1 parent 7133e56 commit e89e22b
Showing 1 changed file with 67 additions and 84 deletions.
151 changes: 67 additions & 84 deletions drivers/hwmon/lm85.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);
*/

/* IN are scaled acording to built-in resistors */
static int lm85_scaling[] = { /* .001 Volts */
static const int lm85_scaling[] = { /* .001 Volts */
2500, 2250, 3300, 5000, 12000,
3300, 1500, 1800 /*EMC6D100*/
};
Expand Down Expand Up @@ -164,7 +164,7 @@ static inline u16 FAN_TO_REG(unsigned long val)
*/

/* These are the zone temperature range encodings in .001 degree C */
static int lm85_range_map[] = {
static const int lm85_range_map[] = {
2000, 2500, 3300, 4000, 5000, 6600, 8000, 10000,
13300, 16000, 20000, 26600, 32000, 40000, 53300, 80000
};
Expand All @@ -190,13 +190,8 @@ static int RANGE_TO_REG(int range)
}
#define RANGE_FROM_REG(val) lm85_range_map[(val) & 0x0f]

/* These are the Acoustic Enhancement, or Temperature smoothing encodings
* NOTE: The enable/disable bit is INCLUDED in these encodings as the
* MSB (bit 3, value 8). If the enable bit is 0, the encoded value
* is ignored, or set to 0.
*/
/* These are the PWM frequency encodings */
static int lm85_freq_map[] = { /* .1 Hz */
static const int lm85_freq_map[] = { /* .1 Hz */
100, 150, 230, 300, 380, 470, 620, 940
};

Expand All @@ -209,7 +204,7 @@ static int FREQ_TO_REG(int freq)
for (i = 0; i < 7; ++i)
if (freq <= lm85_freq_map[i])
break;
return i & 0x07;
return i;
}
#define FREQ_FROM_REG(val) lm85_freq_map[(val) & 0x07]

Expand All @@ -225,8 +220,8 @@ static int FREQ_TO_REG(int freq)
* -2 -- PWM responds to manual control
*/

static int lm85_zone_map[] = { 1, 2, 3, -1, 0, 23, 123, -2 };
#define ZONE_FROM_REG(val) lm85_zone_map[((val) >> 5) & 0x07]
static const int lm85_zone_map[] = { 1, 2, 3, -1, 0, 23, 123, -2 };
#define ZONE_FROM_REG(val) lm85_zone_map[(val) >> 5]

static int ZONE_TO_REG(int zone)
{
Expand All @@ -237,7 +232,7 @@ static int ZONE_TO_REG(int zone)
break;
if (i > 7) /* Not found. */
i = 3; /* Always 100% */
return (i & 0x07) << 5;
return i << 5;
}

#define HYST_TO_REG(val) SENSORS_LIMIT(((val) + 500) / 1000, 0, 15)
Expand Down Expand Up @@ -321,7 +316,7 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
static int lm85_detach_client(struct i2c_client *client);

static int lm85_read_value(struct i2c_client *client, u8 reg);
static int lm85_write_value(struct i2c_client *client, u8 reg, int value);
static void lm85_write_value(struct i2c_client *client, u8 reg, int value);
static struct lm85_data *lm85_update_device(struct device *dev);
static void lm85_init_client(struct i2c_client *client);

Expand Down Expand Up @@ -1095,13 +1090,12 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
int kind)
{
int company, verstep;
struct i2c_client *new_client = NULL;
struct i2c_client *client;
struct lm85_data *data;
int err = 0;
const char *type_name = "";
const char *type_name;

if (!i2c_check_functionality(adapter,
I2C_FUNC_SMBUS_BYTE_DATA)) {
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
/* We need to be able to do byte I/O */
goto ERROR0;
}
Expand All @@ -1115,21 +1109,20 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
goto ERROR0;
}

new_client = &data->client;
i2c_set_clientdata(new_client, data);
new_client->addr = address;
new_client->adapter = adapter;
new_client->driver = &lm85_driver;
new_client->flags = 0;
client = &data->client;
i2c_set_clientdata(client, data);
client->addr = address;
client->adapter = adapter;
client->driver = &lm85_driver;

/* Now, we do the remaining detection. */

company = lm85_read_value(new_client, LM85_REG_COMPANY);
verstep = lm85_read_value(new_client, LM85_REG_VERSTEP);
company = lm85_read_value(client, LM85_REG_COMPANY);
verstep = lm85_read_value(client, LM85_REG_VERSTEP);

dev_dbg(&adapter->dev, "Detecting device at %d,0x%02x with"
" COMPANY: 0x%02x and VERSTEP: 0x%02x\n",
i2c_adapter_id(new_client->adapter), new_client->addr,
i2c_adapter_id(client->adapter), client->addr,
company, verstep);

/* If auto-detecting, Determine the chip type. */
Expand Down Expand Up @@ -1196,56 +1189,65 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
}

/* Fill in the chip specific driver values */
if (kind == any_chip)
type_name = "lm85";
else if (kind == lm85b)
switch (kind) {
case lm85b:
type_name = "lm85b";
else if (kind == lm85c)
break;
case lm85c:
type_name = "lm85c";
else if (kind == adm1027)
break;
case adm1027:
type_name = "adm1027";
else if (kind == adt7463)
break;
case adt7463:
type_name = "adt7463";
else if (kind == emc6d100)
break;
case emc6d100:
type_name = "emc6d100";
else if (kind == emc6d102)
break;
case emc6d102:
type_name = "emc6d102";
strlcpy(new_client->name, type_name, I2C_NAME_SIZE);
break;
default:
type_name = "lm85";
}
strlcpy(client->name, type_name, I2C_NAME_SIZE);

/* Fill in the remaining client fields */
data->type = kind;
data->valid = 0;
mutex_init(&data->update_lock);

/* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client)))
err = i2c_attach_client(client);
if (err)
goto ERROR1;

/* Set the VRM version */
data->vrm = vid_which_vrm();

/* Initialize the LM85 chip */
lm85_init_client(new_client);
lm85_init_client(client);

/* Register sysfs hooks */
if ((err = sysfs_create_group(&new_client->dev.kobj, &lm85_group)))
err = sysfs_create_group(&client->dev.kobj, &lm85_group);
if (err)
goto ERROR2;

/* The ADT7463 has an optional VRM 10 mode where pin 21 is used
as a sixth digital VID input rather than an analog input. */
data->vid = lm85_read_value(new_client, LM85_REG_VID);
data->vid = lm85_read_value(client, LM85_REG_VID);
if (!(kind == adt7463 && (data->vid & 0x80)))
if ((err = sysfs_create_group(&new_client->dev.kobj,
if ((err = sysfs_create_group(&client->dev.kobj,
&lm85_group_in4)))
goto ERROR3;

/* The EMC6D100 has 3 additional voltage inputs */
if (kind == emc6d100)
if ((err = sysfs_create_group(&new_client->dev.kobj,
if ((err = sysfs_create_group(&client->dev.kobj,
&lm85_group_in567)))
goto ERROR3;

data->hwmon_dev = hwmon_device_register(&new_client->dev);
data->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(data->hwmon_dev)) {
err = PTR_ERR(data->hwmon_dev);
goto ERROR3;
Expand All @@ -1255,12 +1257,12 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,

/* Error out and cleanup code */
ERROR3:
sysfs_remove_group(&new_client->dev.kobj, &lm85_group);
sysfs_remove_group(&new_client->dev.kobj, &lm85_group_in4);
sysfs_remove_group(&client->dev.kobj, &lm85_group);
sysfs_remove_group(&client->dev.kobj, &lm85_group_in4);
if (kind == emc6d100)
sysfs_remove_group(&new_client->dev.kobj, &lm85_group_in567);
sysfs_remove_group(&client->dev.kobj, &lm85_group_in567);
ERROR2:
i2c_detach_client(new_client);
i2c_detach_client(client);
ERROR1:
kfree(data);
ERROR0:
Expand Down Expand Up @@ -1307,10 +1309,8 @@ static int lm85_read_value(struct i2c_client *client, u8 reg)
return res;
}

static int lm85_write_value(struct i2c_client *client, u8 reg, int value)
static void lm85_write_value(struct i2c_client *client, u8 reg, int value)
{
int res;

switch (reg) {
case LM85_REG_FAN(0): /* Write WORD data */
case LM85_REG_FAN(1):
Expand All @@ -1321,16 +1321,13 @@ static int lm85_write_value(struct i2c_client *client, u8 reg, int value)
case LM85_REG_FAN_MIN(2):
case LM85_REG_FAN_MIN(3):
/* NOTE: ALARM is read only, so not included here */
res = i2c_smbus_write_byte_data(client, reg, value & 0xff);
res |= i2c_smbus_write_byte_data(client, reg + 1,
(value >> 8) & 0xff);
i2c_smbus_write_byte_data(client, reg, value & 0xff);
i2c_smbus_write_byte_data(client, reg + 1, value >> 8);
break;
default: /* Write BYTE data */
res = i2c_smbus_write_byte_data(client, reg, value);
i2c_smbus_write_byte_data(client, reg, value);
break;
}

return res;
}

static void lm85_init_client(struct i2c_client *client)
Expand Down Expand Up @@ -1414,24 +1411,18 @@ static struct lm85_data *lm85_update_device(struct device *dev)
for (i = 0; i <= 3; ++i) {
data->in[i] =
lm85_read_value(client, LM85_REG_IN(i));
data->fan[i] =
lm85_read_value(client, LM85_REG_FAN(i));
}

if (!(data->type == adt7463 && (data->vid & 0x80))) {
data->in[4] = lm85_read_value(client,
LM85_REG_IN(4));
}

for (i = 0; i <= 3; ++i) {
data->fan[i] =
lm85_read_value(client, LM85_REG_FAN(i));
}

for (i = 0; i <= 2; ++i) {
data->temp[i] =
lm85_read_value(client, LM85_REG_TEMP(i));
}

for (i = 0; i <= 2; ++i) {
data->pwm[i] =
lm85_read_value(client, LM85_REG_PWM(i));
}
Expand Down Expand Up @@ -1462,13 +1453,13 @@ static struct lm85_data *lm85_update_device(struct device *dev)
EMC6D102_REG_EXTEND_ADC4);
data->in_ext[0] = ext3 & 0x0f;
data->in_ext[1] = ext4 & 0x0f;
data->in_ext[2] = (ext4 >> 4) & 0x0f;
data->in_ext[3] = (ext3 >> 4) & 0x0f;
data->in_ext[4] = (ext2 >> 4) & 0x0f;
data->in_ext[2] = ext4 >> 4;
data->in_ext[3] = ext3 >> 4;
data->in_ext[4] = ext2 >> 4;

data->temp_ext[0] = ext1 & 0x0f;
data->temp_ext[1] = ext2 & 0x0f;
data->temp_ext[2] = (ext1 >> 4) & 0x0f;
data->temp_ext[2] = ext1 >> 4;
}

data->last_reading = jiffies;
Expand All @@ -1484,6 +1475,8 @@ static struct lm85_data *lm85_update_device(struct device *dev)
lm85_read_value(client, LM85_REG_IN_MIN(i));
data->in_max[i] =
lm85_read_value(client, LM85_REG_IN_MAX(i));
data->fan_min[i] =
lm85_read_value(client, LM85_REG_FAN_MIN(i));
}

if (!(data->type == adt7463 && (data->vid & 0x80))) {
Expand All @@ -1502,25 +1495,19 @@ static struct lm85_data *lm85_update_device(struct device *dev)
}
}

for (i = 0; i <= 3; ++i) {
data->fan_min[i] =
lm85_read_value(client, LM85_REG_FAN_MIN(i));
}

for (i = 0; i <= 2; ++i) {
int val;

data->temp_min[i] =
lm85_read_value(client, LM85_REG_TEMP_MIN(i));
data->temp_max[i] =
lm85_read_value(client, LM85_REG_TEMP_MAX(i));
}

for (i = 0; i <= 2; ++i) {
int val;
data->autofan[i].config =
lm85_read_value(client, LM85_REG_AFAN_CONFIG(i));
val = lm85_read_value(client, LM85_REG_AFAN_RANGE(i));
data->autofan[i].freq = val & 0x07;
data->zone[i].range = (val >> 4) & 0x0f;
data->zone[i].range = val >> 4;
data->autofan[i].min_pwm =
lm85_read_value(client, LM85_REG_AFAN_MINPWM(i));
data->zone[i].limit =
Expand All @@ -1535,11 +1522,11 @@ static struct lm85_data *lm85_update_device(struct device *dev)
data->autofan[2].min_off = (i & 0x80) != 0;

i = lm85_read_value(client, LM85_REG_AFAN_HYST1);
data->zone[0].hyst = (i >> 4) & 0x0f;
data->zone[0].hyst = i >> 4;
data->zone[1].hyst = i & 0x0f;

i = lm85_read_value(client, LM85_REG_AFAN_HYST2);
data->zone[2].hyst = (i >> 4) & 0x0f;
data->zone[2].hyst = i >> 4;

data->last_config = jiffies;
} /* last_config */
Expand All @@ -1562,14 +1549,10 @@ static void __exit sm_lm85_exit(void)
i2c_del_driver(&lm85_driver);
}

/* Thanks to Richard Barrington for adding the LM85 to sensors-detect.
* Thanks to Margit Schubert-While <margitsw@t-online.de> for help with
* post 2.7.0 CVS changes.
*/
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Philip Pokorny <ppokorny@penguincomputing.com>, "
"Margit Schubert-While <margitsw@t-online.de>, "
"Justin Thiessen <jthiessen@penguincomputing.com");
"Justin Thiessen <jthiessen@penguincomputing.com>");
MODULE_DESCRIPTION("LM85-B, LM85-C driver");

module_init(sm_lm85_init);
Expand Down

0 comments on commit e89e22b

Please sign in to comment.