aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2014-04-04 12:01:33 -0400
committerJean Delvare <jdelvare@suse.de>2014-04-04 12:01:33 -0400
commit2fd638feb6b39cbbc10989a57a25c868fe65b118 (patch)
treef158b59e58e85e3466214149e1b5600da7fc87e4
parent0dcb28a1520f1a058058886b5c7510bb1cc0ef60 (diff)
hwmon: (lm63) Introduce 'dev' variable to point to client->dev
client->dev is used multiple times in several functions. Introduce dev variable pointing to it to simplify the code. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Jean Delvare <jdelvare@suse.de>
-rw-r--r--drivers/hwmon/lm63.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 7ff4fc7c6dbd..55b7d98cb742 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -1038,6 +1038,7 @@ static int lm63_detect(struct i2c_client *client,
1038static void lm63_init_client(struct i2c_client *client) 1038static void lm63_init_client(struct i2c_client *client)
1039{ 1039{
1040 struct lm63_data *data = i2c_get_clientdata(client); 1040 struct lm63_data *data = i2c_get_clientdata(client);
1041 struct device *dev = &client->dev;
1041 u8 convrate; 1042 u8 convrate;
1042 1043
1043 data->config = i2c_smbus_read_byte_data(client, LM63_REG_CONFIG1); 1044 data->config = i2c_smbus_read_byte_data(client, LM63_REG_CONFIG1);
@@ -1046,7 +1047,7 @@ static void lm63_init_client(struct i2c_client *client)
1046 1047
1047 /* Start converting if needed */ 1048 /* Start converting if needed */
1048 if (data->config & 0x40) { /* standby */ 1049 if (data->config & 0x40) { /* standby */
1049 dev_dbg(&client->dev, "Switching to operational mode\n"); 1050 dev_dbg(dev, "Switching to operational mode\n");
1050 data->config &= 0xA7; 1051 data->config &= 0xA7;
1051 i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1, 1052 i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1,
1052 data->config); 1053 data->config);
@@ -1099,13 +1100,13 @@ static void lm63_init_client(struct i2c_client *client)
1099 1100
1100 /* Show some debug info about the LM63 configuration */ 1101 /* Show some debug info about the LM63 configuration */
1101 if (data->kind == lm63) 1102 if (data->kind == lm63)
1102 dev_dbg(&client->dev, "Alert/tach pin configured for %s\n", 1103 dev_dbg(dev, "Alert/tach pin configured for %s\n",
1103 (data->config & 0x04) ? "tachometer input" : 1104 (data->config & 0x04) ? "tachometer input" :
1104 "alert output"); 1105 "alert output");
1105 dev_dbg(&client->dev, "PWM clock %s kHz, output frequency %u Hz\n", 1106 dev_dbg(dev, "PWM clock %s kHz, output frequency %u Hz\n",
1106 (data->config_fan & 0x08) ? "1.4" : "360", 1107 (data->config_fan & 0x08) ? "1.4" : "360",
1107 ((data->config_fan & 0x08) ? 700 : 180000) / data->pwm1_freq); 1108 ((data->config_fan & 0x08) ? 700 : 180000) / data->pwm1_freq);
1108 dev_dbg(&client->dev, "PWM output active %s, %s mode\n", 1109 dev_dbg(dev, "PWM output active %s, %s mode\n",
1109 (data->config_fan & 0x10) ? "low" : "high", 1110 (data->config_fan & 0x10) ? "low" : "high",
1110 (data->config_fan & 0x20) ? "manual" : "auto"); 1111 (data->config_fan & 0x20) ? "manual" : "auto");
1111} 1112}
@@ -1113,10 +1114,11 @@ static void lm63_init_client(struct i2c_client *client)
1113static int lm63_probe(struct i2c_client *client, 1114static int lm63_probe(struct i2c_client *client,
1114 const struct i2c_device_id *id) 1115 const struct i2c_device_id *id)
1115{ 1116{
1117 struct device *dev = &client->dev;
1116 struct lm63_data *data; 1118 struct lm63_data *data;
1117 int err; 1119 int err;
1118 1120
1119 data = devm_kzalloc(&client->dev, sizeof(struct lm63_data), GFP_KERNEL); 1121 data = devm_kzalloc(dev, sizeof(struct lm63_data), GFP_KERNEL);
1120 if (!data) 1122 if (!data)
1121 return -ENOMEM; 1123 return -ENOMEM;
1122 1124
@@ -1133,27 +1135,25 @@ static int lm63_probe(struct i2c_client *client,
1133 lm63_init_client(client); 1135 lm63_init_client(client);
1134 1136
1135 /* Register sysfs hooks */ 1137 /* Register sysfs hooks */
1136 err = sysfs_create_group(&client->dev.kobj, &lm63_group); 1138 err = sysfs_create_group(&dev->kobj, &lm63_group);
1137 if (err) 1139 if (err)
1138 return err; 1140 return err;
1139 if (data->config & 0x04) { /* tachometer enabled */ 1141 if (data->config & 0x04) { /* tachometer enabled */
1140 err = sysfs_create_group(&client->dev.kobj, &lm63_group_fan1); 1142 err = sysfs_create_group(&dev->kobj, &lm63_group_fan1);
1141 if (err) 1143 if (err)
1142 goto exit_remove_files; 1144 goto exit_remove_files;
1143 } 1145 }
1144 if (data->kind == lm96163) { 1146 if (data->kind == lm96163) {
1145 err = sysfs_create_group(&client->dev.kobj, 1147 err = sysfs_create_group(&dev->kobj, &lm63_group_temp2_type);
1146 &lm63_group_temp2_type);
1147 if (err) 1148 if (err)
1148 goto exit_remove_files; 1149 goto exit_remove_files;
1149 1150
1150 err = sysfs_create_group(&client->dev.kobj, 1151 err = sysfs_create_group(&dev->kobj, &lm63_group_extra_lut);
1151 &lm63_group_extra_lut);
1152 if (err) 1152 if (err)
1153 goto exit_remove_files; 1153 goto exit_remove_files;
1154 } 1154 }
1155 1155
1156 data->hwmon_dev = hwmon_device_register(&client->dev); 1156 data->hwmon_dev = hwmon_device_register(dev);
1157 if (IS_ERR(data->hwmon_dev)) { 1157 if (IS_ERR(data->hwmon_dev)) {
1158 err = PTR_ERR(data->hwmon_dev); 1158 err = PTR_ERR(data->hwmon_dev);
1159 goto exit_remove_files; 1159 goto exit_remove_files;
@@ -1162,11 +1162,11 @@ static int lm63_probe(struct i2c_client *client,
1162 return 0; 1162 return 0;
1163 1163
1164exit_remove_files: 1164exit_remove_files:
1165 sysfs_remove_group(&client->dev.kobj, &lm63_group); 1165 sysfs_remove_group(&dev->kobj, &lm63_group);
1166 sysfs_remove_group(&client->dev.kobj, &lm63_group_fan1); 1166 sysfs_remove_group(&dev->kobj, &lm63_group_fan1);
1167 if (data->kind == lm96163) { 1167 if (data->kind == lm96163) {
1168 sysfs_remove_group(&client->dev.kobj, &lm63_group_temp2_type); 1168 sysfs_remove_group(&dev->kobj, &lm63_group_temp2_type);
1169 sysfs_remove_group(&client->dev.kobj, &lm63_group_extra_lut); 1169 sysfs_remove_group(&dev->kobj, &lm63_group_extra_lut);
1170 } 1170 }
1171 return err; 1171 return err;
1172} 1172}