drm: renesas: shmobile: Replace .dev_private with container_of()

Now that drm_device is embedded in shmob_drm_device, we can use
a container_of()-based helper to get the shmob_drm_device pointer from
the drm_device, instead of using the deprecated drm_device.dev_private
field.

While at it, restore reverse Xmas tree ordering of local variable
declarations.

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Sui Jingfeng <suijingfeng@loongson.cn>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/8ef4be8bffe75efc7f4b66f3732ec357f7d43e0f.1694767209.git.geert+renesas@glider.be

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
index 207fa98fe76d6f88f1350840b6d96e259b182dab..f62ae047a48f615b4bedd2ca5e3dc391fe251c75 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
@@ -40,7 +40,7 @@
 static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)
 {
        struct drm_crtc *crtc = &scrtc->crtc;
-       struct shmob_drm_device *sdev = crtc->dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
        const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;
        const struct drm_display_mode *mode = &crtc->mode;
        u32 value;
@@ -79,7 +79,7 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)
 
 static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)
 {
-       struct shmob_drm_device *sdev = scrtc->crtc.dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(scrtc->crtc.dev);
        u32 value;
 
        value = lcdc_read(sdev, LDCNT2R);
@@ -113,7 +113,7 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)
 static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
 {
        struct drm_crtc *crtc = &scrtc->crtc;
-       struct shmob_drm_device *sdev = crtc->dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
        const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;
        const struct shmob_drm_format_info *format;
        struct drm_device *dev = &sdev->ddev;
@@ -193,7 +193,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
 static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
 {
        struct drm_crtc *crtc = &scrtc->crtc;
-       struct shmob_drm_device *sdev = crtc->dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
 
        if (!scrtc->started)
                return;
@@ -247,7 +247,7 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,
 static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)
 {
        struct drm_crtc *crtc = &scrtc->crtc;
-       struct shmob_drm_device *sdev = crtc->dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
 
        shmob_drm_crtc_compute_base(scrtc, crtc->x, crtc->y);
 
@@ -289,8 +289,8 @@ static int shmob_drm_crtc_mode_set(struct drm_crtc *crtc,
                                   int x, int y,
                                   struct drm_framebuffer *old_fb)
 {
+       struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
        struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
-       struct shmob_drm_device *sdev = crtc->dev->dev_private;
        const struct shmob_drm_format_info *format;
 
        format = shmob_drm_format_info(crtc->primary->fb->format->format);
@@ -395,7 +395,7 @@ static void shmob_drm_crtc_enable_vblank(struct shmob_drm_device *sdev,
 
 static int shmob_drm_enable_vblank(struct drm_crtc *crtc)
 {
-       struct shmob_drm_device *sdev = crtc->dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
 
        shmob_drm_crtc_enable_vblank(sdev, true);
 
@@ -404,7 +404,7 @@ static int shmob_drm_enable_vblank(struct drm_crtc *crtc)
 
 static void shmob_drm_disable_vblank(struct drm_crtc *crtc)
 {
-       struct shmob_drm_device *sdev = crtc->dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
 
        shmob_drm_crtc_enable_vblank(sdev, false);
 }
@@ -478,7 +478,7 @@ static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder,
                                         struct drm_display_mode *adjusted_mode)
 {
        struct drm_device *dev = encoder->dev;
-       struct shmob_drm_device *sdev = dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(dev);
        struct drm_connector *connector = &sdev->connector.connector;
        const struct drm_display_mode *panel_mode;
 
@@ -548,7 +548,7 @@ static inline struct shmob_drm_connector *to_shmob_connector(struct drm_connecto
 
 static int shmob_drm_connector_get_modes(struct drm_connector *connector)
 {
-       struct shmob_drm_device *sdev = connector->dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(connector->dev);
        struct drm_display_mode *mode;
 
        mode = drm_mode_create(connector->dev);

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
index 56e2f407ab53a476d599c58c787af1b4be6a5574..7e5977d3e256dab299a117647abdfecb3c59c9bd 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
@@ -95,7 +95,7 @@ static int shmob_drm_setup_clocks(struct shmob_drm_device *sdev,
 static irqreturn_t shmob_drm_irq(int irq, void *arg)
 {
        struct drm_device *dev = arg;
-       struct shmob_drm_device *sdev = dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(dev);
        unsigned long flags;
        u32 status;
 
@@ -243,8 +243,6 @@ static int shmob_drm_probe(struct platform_device *pdev)
        if (ret < 0)
                return ret;
 
-       ddev->dev_private = sdev;
-
        ret = shmob_drm_modeset_init(sdev);
        if (ret < 0)
                return dev_err_probe(&pdev->dev, ret,

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h
index 77bb0da48f37ace82265b31415e576916a243ab3..5e55ba7a207865bd9c14a406b565c88e5305711a 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h
@@ -39,4 +39,9 @@ struct shmob_drm_device {
        struct shmob_drm_connector connector;
 };
 
+static inline struct shmob_drm_device *to_shmob_device(struct drm_device *dev)
+{
+       return container_of(dev, struct shmob_drm_device, ddev);
+}
+
 #endif /* __SHMOB_DRM_DRV_H__ */

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
index 258288c80756bf1628a3f5b52d35aa2d9c15fd6e..c58b9dca34736342e772de6834b579427b20f5b6 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
@@ -63,7 +63,7 @@ static void shmob_drm_plane_compute_base(struct shmob_drm_plane *splane,
 static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane,
                                    struct drm_framebuffer *fb)
 {
-       struct shmob_drm_device *sdev = splane->plane.dev->dev_private;
+       struct shmob_drm_device *sdev = to_shmob_device(splane->plane.dev);
        u32 format;
 
        /* TODO: Support ROP3 mode */
@@ -135,8 +135,8 @@ shmob_drm_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
                       uint32_t src_w, uint32_t src_h,
                       struct drm_modeset_acquire_ctx *ctx)
 {
+       struct shmob_drm_device *sdev = to_shmob_device(plane->dev);
        struct shmob_drm_plane *splane = to_shmob_plane(plane);
-       struct shmob_drm_device *sdev = plane->dev->dev_private;
        const struct shmob_drm_format_info *format;
 
        format = shmob_drm_format_info(fb->format->format);
@@ -167,8 +167,8 @@ shmob_drm_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
 static int shmob_drm_plane_disable(struct drm_plane *plane,
                                   struct drm_modeset_acquire_ctx *ctx)
 {
+       struct shmob_drm_device *sdev = to_shmob_device(plane->dev);
        struct shmob_drm_plane *splane = to_shmob_plane(plane);
-       struct shmob_drm_device *sdev = plane->dev->dev_private;
 
        splane->format = NULL;