From: Jean Delvare Date: Fri, 4 Apr 2014 16:01:34 +0000 (+0200) Subject: hwmon: (pc87360) Avoid initializing the same field twice X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5b58157598f93089ccda90aabd98f27865b344da;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Reviewed-by: Guenter Roeck --- diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c index 330fe117e219..988181e4cfcd 100644 --- a/drivers/hwmon/pc87360.c +++ b/drivers/hwmon/pc87360.c @@ -1225,7 +1225,7 @@ static int pc87360_probe(struct platform_device *pdev) int i; struct pc87360_data *data; int err = 0; - const char *name = "pc87360"; + const char *name; int use_thermistors = 0; struct device *dev = &pdev->dev; @@ -1233,13 +1233,14 @@ static int pc87360_probe(struct platform_device *pdev) if (!data) return -ENOMEM; - data->fannr = 2; - data->innr = 0; - data->tempnr = 0; - switch (devid) { + default: + name = "pc87360"; + data->fannr = 2; + break; case 0xe8: name = "pc87363"; + data->fannr = 2; break; case 0xe4: name = "pc87364"; @@ -1260,7 +1261,6 @@ static int pc87360_probe(struct platform_device *pdev) } data->name = name; - data->valid = 0; mutex_init(&data->lock); mutex_init(&data->update_lock); platform_set_drvdata(pdev, data);