drm/mgag200: Integrate init function into load function

Done to simplify initialization code before embedding the DRM device
instance in struct mga_device.

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

diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index 51919b5..186197b 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -90,12 +90,17 @@ static int mga_vram_init(struct mga_device *mdev)
        return 0;
 }
 
-static int mgag200_device_init(struct drm_device *dev,
-                              uint32_t flags)
+int mgag200_driver_load(struct drm_device *dev, unsigned long flags)
 {
-       struct mga_device *mdev = to_mga_device(dev);
+       struct mga_device *mdev;
        int ret, option;
 
+       mdev = devm_kzalloc(dev->dev, sizeof(struct mga_device), GFP_KERNEL);
+       if (mdev == NULL)
+               return -ENOMEM;
+       dev->dev_private = (void *)mdev;
+       mdev->dev = dev;
+
        mdev->flags = mgag200_flags_from_driver_data(flags);
        mdev->type = mgag200_type_from_driver_data(flags);
 
@@ -122,8 +127,8 @@ static int mgag200_device_init(struct drm_device *dev,
        /* stash G200 SE model number for later use */
        if (IS_G200_SE(mdev)) {
                mdev->unique_rev_id = RREG32(0x1e24);
-               DRM_DEBUG("G200 SE unique revision id is 0x%x\n",
-                         mdev->unique_rev_id);
+               drm_dbg(dev, "G200 SE unique revision id is 0x%x\n",
+                       mdev->unique_rev_id);
        }
 
        ret = mga_vram_init(mdev);
@@ -134,33 +139,9 @@ static int mgag200_device_init(struct drm_device *dev,
        mdev->bpp_shifts[1] = 1;
        mdev->bpp_shifts[2] = 0;
        mdev->bpp_shifts[3] = 2;
-       return 0;
-}
-
-/*
- * Functions here will be called by the core once it's bound the driver to
- * a PCI device
- */
-
 
-int mgag200_driver_load(struct drm_device *dev, unsigned long flags)
-{
-       struct mga_device *mdev;
-       int r;
-
-       mdev = devm_kzalloc(dev->dev, sizeof(struct mga_device), GFP_KERNEL);
-       if (mdev == NULL)
-               return -ENOMEM;
-       dev->dev_private = (void *)mdev;
-       mdev->dev = dev;
-
-       r = mgag200_device_init(dev, flags);
-       if (r) {
-               dev_err(&dev->pdev->dev, "Fatal error during GPU init: %d\n", r);
-               return r;
-       }
-       r = mgag200_mm_init(mdev);
-       if (r)
+       ret = mgag200_mm_init(mdev);
+       if (ret)
                goto err_mm;
 
        drm_mode_config_init(dev);
@@ -171,16 +152,15 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags)
                dev->mode_config.preferred_depth = 32;
        dev->mode_config.prefer_shadow = 1;
 
-       r = mgag200_modeset_init(mdev);
-       if (r) {
-               dev_err(&dev->pdev->dev, "Fatal error during modeset init: %d\n", r);
+       ret = mgag200_modeset_init(mdev);
+       if (ret) {
+               drm_err(dev, "Fatal error during modeset init: %d\n", ret);
                goto err_modeset;
        }
 
-       r = mgag200_cursor_init(mdev);
-       if (r)
-               dev_warn(&dev->pdev->dev,
-                       "Could not initialize cursors. Not doing hardware cursors.\n");
+       ret = mgag200_cursor_init(mdev);
+       if (ret)
+               drm_err(dev, "Could not initialize cursors. Not doing hardware cursors.\n");
 
        return 0;
 
@@ -190,8 +170,7 @@ err_modeset:
        mgag200_mm_fini(mdev);
 err_mm:
        dev->dev_private = NULL;
-
-       return r;
+       return ret;
 }
 
 void mgag200_driver_unload(struct drm_device *dev)