提交 5b581575 编写于 作者: J Jean Delvare

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: NJean Delvare <jdelvare@suse.de>
Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
上级 118c9a61
...@@ -1225,7 +1225,7 @@ static int pc87360_probe(struct platform_device *pdev) ...@@ -1225,7 +1225,7 @@ static int pc87360_probe(struct platform_device *pdev)
int i; int i;
struct pc87360_data *data; struct pc87360_data *data;
int err = 0; int err = 0;
const char *name = "pc87360"; const char *name;
int use_thermistors = 0; int use_thermistors = 0;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -1233,13 +1233,14 @@ static int pc87360_probe(struct platform_device *pdev) ...@@ -1233,13 +1233,14 @@ static int pc87360_probe(struct platform_device *pdev)
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
data->fannr = 2;
data->innr = 0;
data->tempnr = 0;
switch (devid) { switch (devid) {
default:
name = "pc87360";
data->fannr = 2;
break;
case 0xe8: case 0xe8:
name = "pc87363"; name = "pc87363";
data->fannr = 2;
break; break;
case 0xe4: case 0xe4:
name = "pc87364"; name = "pc87364";
...@@ -1260,7 +1261,6 @@ static int pc87360_probe(struct platform_device *pdev) ...@@ -1260,7 +1261,6 @@ static int pc87360_probe(struct platform_device *pdev)
} }
data->name = name; data->name = name;
data->valid = 0;
mutex_init(&data->lock); mutex_init(&data->lock);
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册