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

Commit 112abd29 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: simplify sysfs setup code 



Positively checking for the required feature/gen is simpler than build
a cascade of negative "we need to bail" checks. And the later won't
scale if we add more stuff that doesn't fit in nicely.

Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 98fd81cd

drivers/gpu/drm/i915/i915_sysfs.c

+11 −13
Original line number Diff line number Diff line
@@ -205,21 +205,19 @@ void i915_setup_sysfs(struct drm_device *dev) 
{

	int ret;



	/* ILK and below don't yet have relevant sysfs files */

	if (INTEL_INFO(dev)->gen < 6)

		return;



	ret = sysfs_merge_group(&dev->primary->kdev.kobj, &rc6_attr_group);

	if (INTEL_INFO(dev)->gen >= 6) {

		ret = sysfs_merge_group(&dev->primary->kdev.kobj,

					&rc6_attr_group);

		if (ret)

			DRM_ERROR("RC6 residency sysfs setup failed\n");

	}



	if (!IS_IVYBRIDGE(dev))

		return;



	if (IS_IVYBRIDGE(dev)) {

		ret = device_create_bin_file(&dev->primary->kdev, &dpf_attrs);

		if (ret)

			DRM_ERROR("l3 parity sysfs setup failed\n");

	}

}



void i915_teardown_sysfs(struct drm_device *dev)

{