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

Commit e48a7f1a authored by Hans de Goede's avatar Hans de Goede Committed by Guenter Roeck
Browse files

hwmon/f71882fg: Break out test for auto pwm's controlled by digital readings 



Putting this check in its own switch case rather then in the switch case
for adding pwm auto point sysfs attr is cleaner. This is a preparation patch
for adding support for more different models.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent 78aa4f72

drivers/hwmon/f71882fg.c

+23 −17
Original line number Diff line number Diff line
@@ -2075,21 +2075,6 @@ static int __devinit f71882fg_probe(struct platform_device *pdev) 
		}



		switch (data->type) {

		case f71862fg:

			err = f71882fg_create_sysfs_files(pdev,

					f71862fg_auto_pwm_attr,

					ARRAY_SIZE(f71862fg_auto_pwm_attr));

			break;

		case f8000:

			err = f71882fg_create_sysfs_files(pdev,

					f8000_fan_attr,

					ARRAY_SIZE(f8000_fan_attr));

			if (err)

				goto exit_unregister_sysfs;

			err = f71882fg_create_sysfs_files(pdev,

					f8000_auto_pwm_attr,

					ARRAY_SIZE(f8000_auto_pwm_attr));

			break;

		case f71889fg:

			for (i = 0; i < nr_fans; i++) {

				data->pwm_auto_point_mapping[i] =
@@ -2103,10 +2088,30 @@ static int __devinit f71882fg_probe(struct platform_device *pdev) 
					 "Auto pwm controlled by raw digital "

					 "data, disabling pwm auto_point "

					 "sysfs attributes\n");

				goto no_pwm_auto_point;

			}

			break;

		default:

			break;

		}

			/* fall through */

		default: /* f71858fg / f71882fg */



		switch (data->type) {

		case f71862fg:

			err = f71882fg_create_sysfs_files(pdev,

					f71862fg_auto_pwm_attr,

					ARRAY_SIZE(f71862fg_auto_pwm_attr));

			break;

		case f8000:

			err = f71882fg_create_sysfs_files(pdev,

					f8000_fan_attr,

					ARRAY_SIZE(f8000_fan_attr));

			if (err)

				goto exit_unregister_sysfs;

			err = f71882fg_create_sysfs_files(pdev,

					f8000_auto_pwm_attr,

					ARRAY_SIZE(f8000_auto_pwm_attr));

			break;

		default:

			err = f71882fg_create_sysfs_files(pdev,

				&fxxxx_auto_pwm_attr[0][0],

				ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
@@ -2114,6 +2119,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev) 
		if (err)

			goto exit_unregister_sysfs;



no_pwm_auto_point:

		for (i = 0; i < nr_fans; i++)

			dev_info(&pdev->dev, "Fan: %d is in %s mode\n", i + 1,

				 (data->pwm_enable & (1 << 2 * i)) ?