| Message ID | 20200403135828.2542770-34-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | devm_drm_dev_alloc, no more drmm_add_final_kfree | expand |
On Fri, Apr 03, 2020 at 03:58:17PM +0200, Daniel Vetter wrote: > Upcasting using a container_of macro is more typesafe, faster and > easier for the compiler to optimize. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Linus Walleij <linus.walleij@linaro.org> Acked-by: Sam Ravnborg <sam@ravnborg.org> > --- > drivers/gpu/drm/mcde/mcde_display.c | 10 +++++----- > drivers/gpu/drm/mcde/mcde_drm.h | 2 ++ > drivers/gpu/drm/mcde/mcde_drv.c | 5 ++--- > drivers/gpu/drm/mcde/mcde_dsi.c | 2 +- > 4 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/mcde_display.c > index e59907e68854..04e1d38d41f7 100644 > --- a/drivers/gpu/drm/mcde/mcde_display.c > +++ b/drivers/gpu/drm/mcde/mcde_display.c > @@ -948,7 +948,7 @@ static void mcde_display_disable(struct drm_simple_display_pipe *pipe) > { > struct drm_crtc *crtc = &pipe->crtc; > struct drm_device *drm = crtc->dev; > - struct mcde *mcde = drm->dev_private; > + struct mcde *mcde = to_mcde(drm); > struct drm_pending_vblank_event *event; > > drm_crtc_vblank_off(crtc); > @@ -1020,7 +1020,7 @@ static void mcde_display_update(struct drm_simple_display_pipe *pipe, > { > struct drm_crtc *crtc = &pipe->crtc; > struct drm_device *drm = crtc->dev; > - struct mcde *mcde = drm->dev_private; > + struct mcde *mcde = to_mcde(drm); > struct drm_pending_vblank_event *event = crtc->state->event; > struct drm_plane *plane = &pipe->plane; > struct drm_plane_state *pstate = plane->state; > @@ -1078,7 +1078,7 @@ static int mcde_display_enable_vblank(struct drm_simple_display_pipe *pipe) > { > struct drm_crtc *crtc = &pipe->crtc; > struct drm_device *drm = crtc->dev; > - struct mcde *mcde = drm->dev_private; > + struct mcde *mcde = to_mcde(drm); > u32 val; > > /* Enable all VBLANK IRQs */ > @@ -1097,7 +1097,7 @@ static void mcde_display_disable_vblank(struct drm_simple_display_pipe *pipe) > { > struct drm_crtc *crtc = &pipe->crtc; > struct drm_device *drm = crtc->dev; > - struct mcde *mcde = drm->dev_private; > + struct mcde *mcde = to_mcde(drm); > > /* Disable all VBLANK IRQs */ > writel(0, mcde->regs + MCDE_IMSCPP); > @@ -1117,7 +1117,7 @@ static struct drm_simple_display_pipe_funcs mcde_display_funcs = { > > int mcde_display_init(struct drm_device *drm) > { > - struct mcde *mcde = drm->dev_private; > + struct mcde *mcde = to_mcde(drm); > int ret; > static const u32 formats[] = { > DRM_FORMAT_ARGB8888, > diff --git a/drivers/gpu/drm/mcde/mcde_drm.h b/drivers/gpu/drm/mcde/mcde_drm.h > index 80edd6628979..679c2c4e6d9d 100644 > --- a/drivers/gpu/drm/mcde/mcde_drm.h > +++ b/drivers/gpu/drm/mcde/mcde_drm.h > @@ -34,6 +34,8 @@ struct mcde { > struct regulator *vana; > }; > > +#define to_mcde(dev) container_of(dev, struct mcde, drm) > + > bool mcde_dsi_irq(struct mipi_dsi_device *mdsi); > void mcde_dsi_te_request(struct mipi_dsi_device *mdsi); > extern struct platform_driver mcde_dsi_driver; > diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c > index bdb525e3c5d7..84f3e2dbd77b 100644 > --- a/drivers/gpu/drm/mcde/mcde_drv.c > +++ b/drivers/gpu/drm/mcde/mcde_drv.c > @@ -164,7 +164,7 @@ static irqreturn_t mcde_irq(int irq, void *data) > static int mcde_modeset_init(struct drm_device *drm) > { > struct drm_mode_config *mode_config; > - struct mcde *mcde = drm->dev_private; > + struct mcde *mcde = to_mcde(drm); > int ret; > > if (!mcde->bridge) { > @@ -311,7 +311,6 @@ static int mcde_probe(struct platform_device *pdev) > if (IS_ERR(mcde)) > return PTR_ERR(mcde); > drm = &mcde->drm; > - drm->dev_private = mcde; > mcde->dev = dev; > platform_set_drvdata(pdev, drm); > > @@ -486,7 +485,7 @@ static int mcde_probe(struct platform_device *pdev) > static int mcde_remove(struct platform_device *pdev) > { > struct drm_device *drm = platform_get_drvdata(pdev); > - struct mcde *mcde = drm->dev_private; > + struct mcde *mcde = to_mcde(drm); > > component_master_del(&pdev->dev, &mcde_drm_comp_ops); > clk_disable_unprepare(mcde->mcde_clk); > diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c > index 7af5ebb0c436..1baa2324cdb9 100644 > --- a/drivers/gpu/drm/mcde/mcde_dsi.c > +++ b/drivers/gpu/drm/mcde/mcde_dsi.c > @@ -1020,7 +1020,7 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, > void *data) > { > struct drm_device *drm = data; > - struct mcde *mcde = drm->dev_private; > + struct mcde *mcde = to_mcde(drm); > struct mcde_dsi *d = dev_get_drvdata(dev); > struct device_node *child; > struct drm_panel *panel = NULL; > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Fri, Apr 3, 2020 at 3:59 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Upcasting using a container_of macro is more typesafe, faster and > easier for the compiler to optimize. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Linus Walleij <linus.walleij@linaro.org> Nice, thanks! Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/mcde_display.c index e59907e68854..04e1d38d41f7 100644 --- a/drivers/gpu/drm/mcde/mcde_display.c +++ b/drivers/gpu/drm/mcde/mcde_display.c @@ -948,7 +948,7 @@ static void mcde_display_disable(struct drm_simple_display_pipe *pipe) { struct drm_crtc *crtc = &pipe->crtc; struct drm_device *drm = crtc->dev; - struct mcde *mcde = drm->dev_private; + struct mcde *mcde = to_mcde(drm); struct drm_pending_vblank_event *event; drm_crtc_vblank_off(crtc); @@ -1020,7 +1020,7 @@ static void mcde_display_update(struct drm_simple_display_pipe *pipe, { struct drm_crtc *crtc = &pipe->crtc; struct drm_device *drm = crtc->dev; - struct mcde *mcde = drm->dev_private; + struct mcde *mcde = to_mcde(drm); struct drm_pending_vblank_event *event = crtc->state->event; struct drm_plane *plane = &pipe->plane; struct drm_plane_state *pstate = plane->state; @@ -1078,7 +1078,7 @@ static int mcde_display_enable_vblank(struct drm_simple_display_pipe *pipe) { struct drm_crtc *crtc = &pipe->crtc; struct drm_device *drm = crtc->dev; - struct mcde *mcde = drm->dev_private; + struct mcde *mcde = to_mcde(drm); u32 val; /* Enable all VBLANK IRQs */ @@ -1097,7 +1097,7 @@ static void mcde_display_disable_vblank(struct drm_simple_display_pipe *pipe) { struct drm_crtc *crtc = &pipe->crtc; struct drm_device *drm = crtc->dev; - struct mcde *mcde = drm->dev_private; + struct mcde *mcde = to_mcde(drm); /* Disable all VBLANK IRQs */ writel(0, mcde->regs + MCDE_IMSCPP); @@ -1117,7 +1117,7 @@ static struct drm_simple_display_pipe_funcs mcde_display_funcs = { int mcde_display_init(struct drm_device *drm) { - struct mcde *mcde = drm->dev_private; + struct mcde *mcde = to_mcde(drm); int ret; static const u32 formats[] = { DRM_FORMAT_ARGB8888, diff --git a/drivers/gpu/drm/mcde/mcde_drm.h b/drivers/gpu/drm/mcde/mcde_drm.h index 80edd6628979..679c2c4e6d9d 100644 --- a/drivers/gpu/drm/mcde/mcde_drm.h +++ b/drivers/gpu/drm/mcde/mcde_drm.h @@ -34,6 +34,8 @@ struct mcde { struct regulator *vana; }; +#define to_mcde(dev) container_of(dev, struct mcde, drm) + bool mcde_dsi_irq(struct mipi_dsi_device *mdsi); void mcde_dsi_te_request(struct mipi_dsi_device *mdsi); extern struct platform_driver mcde_dsi_driver; diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index bdb525e3c5d7..84f3e2dbd77b 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -164,7 +164,7 @@ static irqreturn_t mcde_irq(int irq, void *data) static int mcde_modeset_init(struct drm_device *drm) { struct drm_mode_config *mode_config; - struct mcde *mcde = drm->dev_private; + struct mcde *mcde = to_mcde(drm); int ret; if (!mcde->bridge) { @@ -311,7 +311,6 @@ static int mcde_probe(struct platform_device *pdev) if (IS_ERR(mcde)) return PTR_ERR(mcde); drm = &mcde->drm; - drm->dev_private = mcde; mcde->dev = dev; platform_set_drvdata(pdev, drm); @@ -486,7 +485,7 @@ static int mcde_probe(struct platform_device *pdev) static int mcde_remove(struct platform_device *pdev) { struct drm_device *drm = platform_get_drvdata(pdev); - struct mcde *mcde = drm->dev_private; + struct mcde *mcde = to_mcde(drm); component_master_del(&pdev->dev, &mcde_drm_comp_ops); clk_disable_unprepare(mcde->mcde_clk); diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 7af5ebb0c436..1baa2324cdb9 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -1020,7 +1020,7 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, void *data) { struct drm_device *drm = data; - struct mcde *mcde = drm->dev_private; + struct mcde *mcde = to_mcde(drm); struct mcde_dsi *d = dev_get_drvdata(dev); struct device_node *child; struct drm_panel *panel = NULL;
Upcasting using a container_of macro is more typesafe, faster and easier for the compiler to optimize. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpu/drm/mcde/mcde_display.c | 10 +++++----- drivers/gpu/drm/mcde/mcde_drm.h | 2 ++ drivers/gpu/drm/mcde/mcde_drv.c | 5 ++--- drivers/gpu/drm/mcde/mcde_dsi.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-)