Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (pc87360) Avoid initializing the same field twice

data is kzalloc'd, so data->valid, data->innr and data->tempnr are
already 0. Also rework the initialization path to only set name and
data->fannr once.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>

+6 -6
+6 -6
drivers/hwmon/pc87360.c
··· 1225 1225 int i; 1226 1226 struct pc87360_data *data; 1227 1227 int err = 0; 1228 - const char *name = "pc87360"; 1228 + const char *name; 1229 1229 int use_thermistors = 0; 1230 1230 struct device *dev = &pdev->dev; 1231 1231 ··· 1233 1233 if (!data) 1234 1234 return -ENOMEM; 1235 1235 1236 - data->fannr = 2; 1237 - data->innr = 0; 1238 - data->tempnr = 0; 1239 - 1240 1236 switch (devid) { 1237 + default: 1238 + name = "pc87360"; 1239 + data->fannr = 2; 1240 + break; 1241 1241 case 0xe8: 1242 1242 name = "pc87363"; 1243 + data->fannr = 2; 1243 1244 break; 1244 1245 case 0xe4: 1245 1246 name = "pc87364"; ··· 1261 1260 } 1262 1261 1263 1262 data->name = name; 1264 - data->valid = 0; 1265 1263 mutex_init(&data->lock); 1266 1264 mutex_init(&data->update_lock); 1267 1265 platform_set_drvdata(pdev, data);