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

Commit 0d18abed authored by Dan Carpenter's avatar Dan Carpenter Committed by Dave Airlie
Browse files

radeon: handle errors in radeon_hwmon_init() 



Smatch complained that the ERR_PTR from hwmon_device_register() wasn't
handled.  I added some error handling in radeon_hwmon_init() to silence
the warning.

Unfortunately errors from radeon_pm_init() aren't handled so this
doesn't really make a difference beyond silencing the warning.

Also I changed DRM_ERROR() to dev_err() which is the new preferred
method.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 26b5bc98

drivers/gpu/drm/radeon/radeon_pm.c

+19 −5
Original line number Original line Diff line number Diff line
@@ -472,9 +472,9 @@ static const struct attribute_group hwmon_attrgroup = { 
	.attrs = hwmon_attributes,

	.attrs = hwmon_attributes,

};

};





static void radeon_hwmon_init(struct radeon_device *rdev)

static int radeon_hwmon_init(struct radeon_device *rdev)

{

{

	int err;

	int err = 0;





	rdev->pm.int_hwmon_dev = NULL;

	rdev->pm.int_hwmon_dev = NULL;
@@ -483,15 +483,26 @@ static void radeon_hwmon_init(struct radeon_device *rdev) 
	case THERMAL_TYPE_RV770:

	case THERMAL_TYPE_RV770:

	case THERMAL_TYPE_EVERGREEN:

	case THERMAL_TYPE_EVERGREEN:

		rdev->pm.int_hwmon_dev = hwmon_device_register(rdev->dev);

		rdev->pm.int_hwmon_dev = hwmon_device_register(rdev->dev);

		if (IS_ERR(rdev->pm.int_hwmon_dev)) {

			err = PTR_ERR(rdev->pm.int_hwmon_dev);

			dev_err(rdev->dev,

				"Unable to register hwmon device: %d\n", err);

			break;

		}

		dev_set_drvdata(rdev->pm.int_hwmon_dev, rdev->ddev);

		dev_set_drvdata(rdev->pm.int_hwmon_dev, rdev->ddev);

		err = sysfs_create_group(&rdev->pm.int_hwmon_dev->kobj,

		err = sysfs_create_group(&rdev->pm.int_hwmon_dev->kobj,

					 &hwmon_attrgroup);

					 &hwmon_attrgroup);

		if (err)

		if (err) {

			DRM_ERROR("Unable to create hwmon sysfs file: %d\n", err);

			dev_err(rdev->dev,

				"Unable to create hwmon sysfs file: %d\n", err);

			hwmon_device_unregister(rdev->dev);

		}

		break;

		break;

	default:

	default:

		break;

		break;

	}

	}



	return err;

}

}





static void radeon_hwmon_fini(struct radeon_device *rdev)

static void radeon_hwmon_fini(struct radeon_device *rdev)
@@ -540,6 +551,7 @@ void radeon_pm_resume(struct radeon_device *rdev) 
int radeon_pm_init(struct radeon_device *rdev)

int radeon_pm_init(struct radeon_device *rdev)

{

{

	int ret;

	int ret;



	/* default to profile method */

	/* default to profile method */

	rdev->pm.pm_method = PM_METHOD_PROFILE;

	rdev->pm.pm_method = PM_METHOD_PROFILE;

	rdev->pm.profile = PM_PROFILE_DEFAULT;

	rdev->pm.profile = PM_PROFILE_DEFAULT;
@@ -561,7 +573,9 @@ int radeon_pm_init(struct radeon_device *rdev) 
	}

	}





	/* set up the internal thermal sensor if applicable */

	/* set up the internal thermal sensor if applicable */

	radeon_hwmon_init(rdev);

	ret = radeon_hwmon_init(rdev);

	if (ret)

		return ret;

	if (rdev->pm.num_power_states > 1) {

	if (rdev->pm.num_power_states > 1) {

		/* where's the best place to put these? */

		/* where's the best place to put these? */

		ret = device_create_file(rdev->dev, &dev_attr_power_profile);

		ret = device_create_file(rdev->dev, &dev_attr_power_profile);