mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From 20b18b0bffee7a206141cafc3c1a4928e46e74bb Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 23 Nov 2022 16:25:56 +0100
|
|
Subject: [PATCH] drm/vc4: txp: Reorder the variable assignments
|
|
|
|
The current order of variable assignments is unneccessarily complex,
|
|
let's make it simpler.
|
|
|
|
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-14-051a0bb60a16@cerno.tech
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_txp.c | 15 ++++++---------
|
|
1 file changed, 6 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_txp.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
|
|
@@ -490,7 +490,6 @@ static int vc4_txp_bind(struct device *d
|
|
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 *d
|
|
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 *d
|
|
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);
|