diff options
| author | Jean Delvare <jdelvare@suse.de> | 2014-04-04 18:01:34 +0200 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2014-04-04 18:01:34 +0200 |
| commit | 5b58157598f93089ccda90aabd98f27865b344da (patch) | |
| tree | 2b933cd00cefacb4a45b6a64decd7b381ab4b54c /drivers/hwmon | |
| parent | 118c9a61f158c8f2e3694ed2a3681c217328a2c1 (diff) | |
| download | op-kernel-dev-5b58157598f93089ccda90aabd98f27865b344da.zip op-kernel-dev-5b58157598f93089ccda90aabd98f27865b344da.tar.gz | |
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>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/pc87360.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c index 330fe11..988181e 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); |
