Unverified Commit c1bcd927 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: txp: Reorder the variable assignments 



The current order of variable assignments is unneccessarily complex,
let's make it simpler.

Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-14-051a0bb60a16@cerno.tech
parent e3479398

drivers/gpu/drm/vc4/vc4_txp.c

+6 −9
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) 
	struct drm_device *drm = dev_get_drvdata(master);

	struct vc4_crtc *vc4_crtc;

	struct vc4_txp *txp;

	struct drm_crtc *crtc;

	struct drm_encoder *encoder;

	int ret, irq;
@@ -501,18 +500,16 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) 
	txp = drmm_kzalloc(drm, sizeof(*txp), GFP_KERNEL);

	if (!txp)

		return -ENOMEM;

	vc4_crtc = &txp->base;

	crtc = &vc4_crtc->base;



	vc4_crtc->pdev = pdev;

	vc4_crtc->data = &vc4_txp_crtc_data;

	vc4_crtc->feeds_txp = true;



	txp->pdev = pdev;



	txp->regs = vc4_ioremap_regs(pdev, 0);

	if (IS_ERR(txp->regs))

		return PTR_ERR(txp->regs);



	vc4_crtc = &txp->base;

	vc4_crtc->pdev = pdev;

	vc4_crtc->data = &vc4_txp_crtc_data;

	vc4_crtc->feeds_txp = true;

	vc4_crtc->regset.base = txp->regs;

	vc4_crtc->regset.regs = txp_regs;

	vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
@@ -533,7 +530,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) 
		return ret;



	encoder = &txp->connector.encoder;

	encoder->possible_crtcs = drm_crtc_mask(crtc);

	encoder->possible_crtcs = drm_crtc_mask(&vc4_crtc->base);



	ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,

			       dev_name(dev), txp);