Re: (subset) [PATCH 14/24] drm/vc4: txp: Reorder the variable assignments

2022-11-28 Thread Maxime Ripard
On Wed, 23 Nov 2022 16:25:56 +0100, Maxime Ripard wrote:
> The current order of variable assignments is unneccessarily complex,
> let's make it simpler.
> 
> 

Applied to drm/drm-misc (drm-misc-next).

Thanks!
Maxime


Re: [PATCH 14/24] drm/vc4: txp: Reorder the variable assignments

2022-11-25 Thread Javier Martinez Canillas
On 11/23/22 16:25, Maxime Ripard wrote:
> The current order of variable assignments is unneccessarily complex,
> let's make it simpler.
> 
> Signed-off-by: Maxime Ripard 
> ---
Much easier to follow indeed.

Reviewed-by: Javier Martinez Canillas 

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat



[PATCH 14/24] drm/vc4: txp: Reorder the variable assignments

2022-11-23 Thread Maxime Ripard
The current order of variable assignments is unneccessarily complex,
let's make it simpler.

Signed-off-by: Maxime Ripard 
---
 drivers/gpu/drm/vc4/vc4_txp.c | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
index bd181b5a7b52..b00c6fae972f 100644
--- 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 *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 = >base;
-   crtc = _crtc->base;
-
-   vc4_crtc->pdev = pdev;
-   vc4_crtc->data = _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 = >base;
+   vc4_crtc->pdev = pdev;
+   vc4_crtc->data = _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 = >connector.encoder;
-   encoder->possible_crtcs = drm_crtc_mask(crtc);
+   encoder->possible_crtcs = drm_crtc_mask(_crtc->base);
 
ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
   dev_name(dev), txp);

-- 
2.38.1-b4-0.11.0-dev-d416f