mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 18:21:24 +02:00
drm/rockchip: dw_dp: Simplify error handling
Make the code a bit more compact by getting rid of the superfluous assignments around PTR_ERR(). While at it, also drop dev assignment in dw_dp_probe(). Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://patch.msgid.link/20260310-drm-rk-fixes-v2-4-645ecfb43f49@collabora.com
This commit is contained in:
parent
9456381d8b
commit
26cb3e26ef
|
|
@ -104,20 +104,15 @@ static int dw_dp_rockchip_bind(struct device *dev, struct device *master, void *
|
|||
drm_encoder_helper_add(encoder, &dw_dp_encoder_helper_funcs);
|
||||
|
||||
dp->base = dw_dp_bind(dev, encoder, plat_data);
|
||||
if (IS_ERR(dp->base)) {
|
||||
ret = PTR_ERR(dp->base);
|
||||
return ret;
|
||||
}
|
||||
if (IS_ERR(dp->base))
|
||||
return PTR_ERR(dp->base);
|
||||
|
||||
connector = drm_bridge_connector_init(drm_dev, encoder);
|
||||
if (IS_ERR(connector)) {
|
||||
ret = PTR_ERR(connector);
|
||||
return dev_err_probe(dev, ret, "Failed to init bridge connector");
|
||||
}
|
||||
if (IS_ERR(connector))
|
||||
return dev_err_probe(dev, PTR_ERR(connector),
|
||||
"Failed to init bridge connector");
|
||||
|
||||
drm_connector_attach_encoder(connector, encoder);
|
||||
|
||||
return 0;
|
||||
return drm_connector_attach_encoder(connector, encoder);
|
||||
}
|
||||
|
||||
static const struct component_ops dw_dp_rockchip_component_ops = {
|
||||
|
|
@ -126,9 +121,7 @@ static const struct component_ops dw_dp_rockchip_component_ops = {
|
|||
|
||||
static int dw_dp_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
|
||||
return component_add(dev, &dw_dp_rockchip_component_ops);
|
||||
return component_add(&pdev->dev, &dw_dp_rockchip_component_ops);
|
||||
}
|
||||
|
||||
static void dw_dp_remove(struct platform_device *pdev)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user