Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b581575 authored by Jean Delvare's avatar Jean Delvare
Browse files

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: default avatarJean Delvare <jdelvare@suse.de>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 118c9a61

drivers/hwmon/pc87360.c

+6 −6
Original line number Diff line number Diff line
@@ -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);