drm/mgag200: Convert struct drm_device to struct mga_device with helper

Mgag200 uses dev_private to look up struct mga_device for instances
of struct drm_device. Use of dev_private is deprecated, so hide it in
the helper function to_mga_device().

v2:
	* make to_mga_device() a function (Sam)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200507090315.21274-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c
index d491edd..aebc9ce 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_cursor.c
+++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c
@@ -260,7 +260,7 @@ int mgag200_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
                            uint32_t handle, uint32_t width, uint32_t height)
 {
        struct drm_device *dev = crtc->dev;
-       struct mga_device *mdev = (struct mga_device *)dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        struct drm_gem_object *obj;
        struct drm_gem_vram_object *gbo = NULL;
        int ret;
@@ -307,7 +307,7 @@ err_drm_gem_object_put_unlocked:
 
 int mgag200_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
 {
-       struct mga_device *mdev = (struct mga_device *)crtc->dev->dev_private;
+       struct mga_device *mdev = to_mga_device(crtc->dev);
 
        /* Our origin is at (64,64) */
        x += 64;

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index 3298b7e..c2f0e4b 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -120,7 +120,7 @@ int mgag200_driver_dumb_create(struct drm_file *file,
                               struct drm_device *dev,
                               struct drm_mode_create_dumb *args)
 {
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        unsigned long pg_align;
 
        if (WARN_ONCE(!dev->vram_mm, "VRAM MM not initialized"))

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 9691252..93e2d23 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@ -182,6 +182,11 @@ struct mga_device {
        struct drm_encoder encoder;
 };
 
+static inline struct mga_device *to_mga_device(struct drm_device *dev)
+{
+       return dev->dev_private;
+}
+
 static inline enum mga_type
 mgag200_type_from_driver_data(kernel_ulong_t driver_data)
 {

diff --git a/drivers/gpu/drm/mgag200/mgag200_i2c.c b/drivers/gpu/drm/mgag200/mgag200_i2c.c
index 9f46359..09731e6 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_i2c.c
+++ b/drivers/gpu/drm/mgag200/mgag200_i2c.c
@@ -61,34 +61,34 @@ static inline void mga_i2c_set(struct mga_device *mdev, int mask, int state)
 static void mga_gpio_setsda(void *data, int state)
 {
        struct mga_i2c_chan *i2c = data;
-       struct mga_device *mdev = i2c->dev->dev_private;
+       struct mga_device *mdev = to_mga_device(i2c->dev);
        mga_i2c_set(mdev, i2c->data, state);
 }
 
 static void mga_gpio_setscl(void *data, int state)
 {
        struct mga_i2c_chan *i2c = data;
-       struct mga_device *mdev = i2c->dev->dev_private;
+       struct mga_device *mdev = to_mga_device(i2c->dev);
        mga_i2c_set(mdev, i2c->clock, state);
 }
 
 static int mga_gpio_getsda(void *data)
 {
        struct mga_i2c_chan *i2c = data;
-       struct mga_device *mdev = i2c->dev->dev_private;
+       struct mga_device *mdev = to_mga_device(i2c->dev);
        return (mga_i2c_read_gpio(mdev) & i2c->data) ? 1 : 0;
 }
 
 static int mga_gpio_getscl(void *data)
 {
        struct mga_i2c_chan *i2c = data;
-       struct mga_device *mdev = i2c->dev->dev_private;
+       struct mga_device *mdev = to_mga_device(i2c->dev);
        return (mga_i2c_read_gpio(mdev) & i2c->clock) ? 1 : 0;
 }
 
 struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev)
 {
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        struct mga_i2c_chan *i2c;
        int ret;
        int data, clock;

diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index b680cf4..b705b77 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -92,7 +92,7 @@ static int mga_vram_init(struct mga_device *mdev)
 static int mgag200_device_init(struct drm_device *dev,
                               uint32_t flags)
 {
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        int ret, option;
 
        mdev->flags = mgag200_flags_from_driver_data(flags);
@@ -195,7 +195,7 @@ err_mm:
 
 void mgag200_driver_unload(struct drm_device *dev)
 {
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
 
        if (mdev == NULL)
                return;

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index d90e839..fa91869 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -28,7 +28,7 @@
 static void mga_crtc_load_lut(struct drm_crtc *crtc)
 {
        struct drm_device *dev = crtc->dev;
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        struct drm_framebuffer *fb = crtc->primary->fb;
        u16 *r_ptr, *g_ptr, *b_ptr;
        int i;
@@ -728,7 +728,7 @@ static int mga_crtc_set_plls(struct mga_device *mdev, long clock)
 
 static void mga_g200wb_prepare(struct drm_crtc *crtc)
 {
-       struct mga_device *mdev = crtc->dev->dev_private;
+       struct mga_device *mdev = to_mga_device(crtc->dev);
        u8 tmp;
        int iter_max;
 
@@ -783,7 +783,7 @@ static void mga_g200wb_prepare(struct drm_crtc *crtc)
 static void mga_g200wb_commit(struct drm_crtc *crtc)
 {
        u8 tmp;
-       struct mga_device *mdev = crtc->dev->dev_private;
+       struct mga_device *mdev = to_mga_device(crtc->dev);
 
        /* 1- The first step is to ensure that the vrsten and hrsten are set */
        WREG8(MGAREG_CRTCEXT_INDEX, 1);
@@ -833,7 +833,7 @@ static void mga_g200wb_commit(struct drm_crtc *crtc)
  */
 static void mga_set_start_address(struct drm_crtc *crtc, unsigned offset)
 {
-       struct mga_device *mdev = crtc->dev->dev_private;
+       struct mga_device *mdev = to_mga_device(crtc->dev);
        u32 addr;
        int count;
        u8 crtcext0;
@@ -902,7 +902,7 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
                                int x, int y, struct drm_framebuffer *old_fb)
 {
        struct drm_device *dev = crtc->dev;
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        const struct drm_framebuffer *fb = crtc->primary->fb;
        int hdisplay, hsyncstart, hsyncend, htotal;
        int vdisplay, vsyncstart, vsyncend, vtotal;
@@ -1263,7 +1263,7 @@ static int mga_resume(struct drm_crtc *crtc)
 static void mga_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
        struct drm_device *dev = crtc->dev;
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        u8 seq1 = 0, crtcext1 = 0;
 
        switch (mode) {
@@ -1317,7 +1317,7 @@ static void mga_crtc_dpms(struct drm_crtc *crtc, int mode)
 static void mga_crtc_prepare(struct drm_crtc *crtc)
 {
        struct drm_device *dev = crtc->dev;
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        u8 tmp;
 
        /*      mga_resume(crtc);*/
@@ -1353,7 +1353,7 @@ static void mga_crtc_prepare(struct drm_crtc *crtc)
 static void mga_crtc_commit(struct drm_crtc *crtc)
 {
        struct drm_device *dev = crtc->dev;
-       struct mga_device *mdev = dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
        u8 tmp;
 
@@ -1495,7 +1495,7 @@ static enum drm_mode_status mga_vga_mode_valid(struct drm_connector *connector,
                                 struct drm_display_mode *mode)
 {
        struct drm_device *dev = connector->dev;
-       struct mga_device *mdev = (struct mga_device*)dev->dev_private;
+       struct mga_device *mdev = to_mga_device(dev);
        int bpp = 32;
 
        if (IS_G200_SE(mdev)) {