Commit 6ebc25d8 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Rafael J. Wysocki
Browse files

thermal: int340x: processor_thermal: Set feature mask before proc_thermal_add 



The function proc_thermal_add() adds sysfs entries for power limits.

The feature mask of available features is not present at that time, so
it cannot be used by proc_thermal_add() to selectively create sysfs
attributes.

The feature mask is set by proc_thermal_mmio_add(), so modify the code
to call it before proc_thermal_add() so as to allow the latter to use
the feature mask.

There is no functional impact with this change.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
[ rjw: Changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 088f16f3

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

+10 −11
Original line number Diff line number Diff line
@@ -266,19 +266,19 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_ 


	INIT_DELAYED_WORK(&pci_info->work, proc_thermal_threshold_work_fn);



	ret = proc_thermal_add(&pdev->dev, proc_priv);

	if (ret) {

		dev_err(&pdev->dev, "error: proc_thermal_add, will continue\n");

		pci_info->no_legacy = 1;

	}



	proc_priv->priv_data = pci_info;

	pci_info->proc_priv = proc_priv;

	pci_set_drvdata(pdev, proc_priv);



	ret = proc_thermal_mmio_add(pdev, proc_priv, id->driver_data);

	if (ret)

		goto err_ret_thermal;

		return ret;



	ret = proc_thermal_add(&pdev->dev, proc_priv);

	if (ret) {

		dev_err(&pdev->dev, "error: proc_thermal_add, will continue\n");

		pci_info->no_legacy = 1;

	}



	psv_trip.temperature = get_trip_temp(pci_info);
@@ -288,7 +288,7 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_ 
							&tzone_params, 0, 0);

	if (IS_ERR(pci_info->tzone)) {

		ret = PTR_ERR(pci_info->tzone);

		goto err_ret_mmio;

		goto err_del_legacy;

	}



	if (use_msi && (pdev->msi_enabled || pdev->msix_enabled)) {
@@ -325,11 +325,10 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_ 
		pci_free_irq_vectors(pdev);

err_ret_tzone:

	thermal_zone_device_unregister(pci_info->tzone);

err_ret_mmio:

	proc_thermal_mmio_remove(pdev, proc_priv);

err_ret_thermal:

err_del_legacy:

	if (!pci_info->no_legacy)

		proc_thermal_remove(proc_priv);

	proc_thermal_mmio_remove(pdev, proc_priv);

	pci_disable_device(pdev);



	return ret;