Unverified Commit 4e06fd9c authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: vec: Switch to devm_pm_runtime_enable



devm_pm_runtime_enable() simplifies the driver a bit since it will call
pm_runtime_disable() automatically through a device-managed action.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-62-maxime@cerno.tech
parent f0601ef8
Loading
Loading
Loading
Loading
+5 −15
Original line number Diff line number Diff line
@@ -583,42 +583,32 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
		return ret;
	}

	pm_runtime_enable(dev);
	ret = devm_pm_runtime_enable(dev);
	if (ret)
		return ret;

	ret = drmm_encoder_init(drm, &vec->encoder.base,
				NULL,
				DRM_MODE_ENCODER_TVDAC,
				NULL);
	if (ret)
		goto err_put_runtime_pm;
		return ret;

	drm_encoder_helper_add(&vec->encoder.base, &vc4_vec_encoder_helper_funcs);

	ret = vc4_vec_connector_init(drm, vec);
	if (ret)
		goto err_put_runtime_pm;
		return ret;

	dev_set_drvdata(dev, vec);

	vc4_debugfs_add_regset32(drm, "vec_regs", &vec->regset);

	return 0;

err_put_runtime_pm:
	pm_runtime_disable(dev);

	return ret;
}

static void vc4_vec_unbind(struct device *dev, struct device *master,
			   void *data)
{
	pm_runtime_disable(dev);
}

static const struct component_ops vc4_vec_ops = {
	.bind   = vc4_vec_bind,
	.unbind = vc4_vec_unbind,
};

static int vc4_vec_dev_probe(struct platform_device *pdev)