drm/udl: introduce a macro to convert dev to udl.

This just makes it easier to later embed drm into udl.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190405031715.5959-3-airlied@gmail.com

4 files changed, 14 insertions, 12 deletions

diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index 4ae67d882eae..b3e08e876d62 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -71,6 +71,8 @@ struct udl_device {
         atomic_t cpu_kcycles_used; /* transpired during pixel processing */
 };
 
+#define to_udl(x) ((x)->dev_private)
+
 struct udl_gem_object {
         struct drm_gem_object base;
         struct page **pages;
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index f8ff5a6f559e..16593d4f02b4 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -82,7 +82,7 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
                       int width, int height)
 {
         struct drm_device *dev = fb->base.dev;
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         int i, ret;
         char *cmd;
         cycles_t start_cycles, end_cycles;
@@ -210,7 +210,7 @@ static int udl_fb_open(struct fb_info *info, int user)
 {
         struct udl_fbdev *ufbdev = info->par;
         struct drm_device *dev = ufbdev->ufb.base.dev;
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
 
         /* If the USB device is gone, we don't accept new opens */
         if (drm_dev_is_unplugged(udl->ddev))
@@ -437,7 +437,7 @@ static void udl_fbdev_destroy(struct drm_device *dev,
 
 int udl_fbdev_init(struct drm_device *dev)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         int bpp_sel = fb_bpp;
         struct udl_fbdev *ufbdev;
         int ret;
@@ -476,7 +476,7 @@ free:
 
 void udl_fbdev_cleanup(struct drm_device *dev)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         if (!udl->fbdev)
                 return;
 
@@ -487,7 +487,7 @@ void udl_fbdev_cleanup(struct drm_device *dev)
 
 void udl_fbdev_unplug(struct drm_device *dev)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         struct udl_fbdev *ufbdev;
         if (!udl->fbdev)
                 return;
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index bb7b58407039..3b3e17652bb2 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -203,7 +203,7 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev,
 {
         struct udl_gem_object *gobj;
         struct drm_gem_object *obj;
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         int ret = 0;
 
         mutex_lock(&udl->gem_lock);
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 1f8ef34ade24..862c099d7c4c 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -30,7 +30,7 @@
 static int udl_parse_vendor_descriptor(struct drm_device *dev,
                                        struct usb_device *usbdev)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         char *desc;
         char *buf;
         char *desc_end;
@@ -166,7 +166,7 @@ void udl_urb_completion(struct urb *urb)
 
 static void udl_free_urb_list(struct drm_device *dev)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         int count = udl->urbs.count;
         struct list_head *node;
         struct urb_node *unode;
@@ -199,7 +199,7 @@ static void udl_free_urb_list(struct drm_device *dev)
 
 static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         struct urb *urb;
         struct urb_node *unode;
         char *buf;
@@ -263,7 +263,7 @@ retry:
 
 struct urb *udl_get_urb(struct drm_device *dev)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         int ret = 0;
         struct list_head *entry;
         struct urb_node *unode;
@@ -296,7 +296,7 @@ error:
 
 int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
         int ret;
 
         BUG_ON(len > udl->urbs.size);
@@ -371,7 +371,7 @@ int udl_drop_usb(struct drm_device *dev)
 
 void udl_driver_unload(struct drm_device *dev)
 {
-        struct udl_device *udl = dev->dev_private;
+        struct udl_device *udl = to_udl(dev);
 
         drm_kms_helper_poll_fini(dev);