diff options
author | Kevin Brace <kevinbrace@gmx.com> | 2018-02-03 13:08:19 -0800 |
---|---|---|
committer | Kevin Brace <kevinbrace@gmx.com> | 2018-02-03 13:08:19 -0800 |
commit | 9d14286691954babf362b69deea75535aace51dd (patch) | |
tree | 5a0be86711d7a242a75b49fc21c43c0916f96d93 /drivers/gpu/drm | |
parent | f3d1fe37b9bdd46a555193e6bd0911df9316fa6f (diff) |
drm/openchrome: Cleaning up via_drv.c
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/openchrome/via_drv.c | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/drivers/gpu/drm/openchrome/via_drv.c b/drivers/gpu/drm/openchrome/via_drv.c index e059d30f1fd7..b515c11440d6 100644 --- a/drivers/gpu/drm/openchrome/via_drv.c +++ b/drivers/gpu/drm/openchrome/via_drv.c @@ -64,8 +64,7 @@ MODULE_DEVICE_TABLE(pci, via_pci_table); #define VIA_AGP_1X_MODE 0x01 #define VIA_AGP_FW_MODE 0x10 -static int -via_detect_agp(struct drm_device *dev) +static int via_detect_agp(struct drm_device *dev) { struct via_device *dev_priv = dev->dev_private; struct drm_agp_info agp_info; @@ -223,7 +222,6 @@ static void chip_revision_info(struct drm_device *dev) /* Restore original CR4F value. */ vga_wcrt(VGABASE, 0x4F, tmp); break; - /* CX700 / VX700 Chipset */ case PCI_DEVICE_ID_VIA_VT3157: tmp = vga_rseq(VGABASE, 0x43); @@ -247,7 +245,6 @@ static void chip_revision_info(struct drm_device *dev) } break; - /* VX800 / VX820 Chipset */ case PCI_DEVICE_ID_VIA_VT1122: @@ -329,11 +326,17 @@ static int via_dumb_mmap(struct drm_file *filp, struct drm_device *dev, static int gem_dumb_destroy(struct drm_file *filp, struct drm_device *dev, uint32_t handle) { - return drm_gem_handle_delete(filp, handle); + int ret; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + ret = drm_gem_handle_delete(filp, handle); + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return ret; } -static int -via_device_init(struct via_device *dev_priv) +static int via_device_init(struct via_device *dev_priv) { int ret; @@ -350,7 +353,6 @@ via_device_init(struct via_device *dev_priv) } via_mmio_setup(dev_priv); - exit: DRM_DEBUG_KMS("Exiting %s.\n", __func__); return ret; @@ -412,8 +414,7 @@ static void via_driver_unload(struct drm_device *dev) return; } -static int -via_driver_load(struct drm_device *dev, unsigned long chipset) +static int via_driver_load(struct drm_device *dev, unsigned long chipset) { struct via_device *dev_priv; int ret = 0; @@ -682,16 +683,23 @@ static struct drm_driver via_driver = { .patchlevel = DRIVER_PATCHLEVEL, }; -static int -via_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +static int via_pci_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) { - return drm_get_pci_dev(pdev, ent, &via_driver); + int ret; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + ret = drm_get_pci_dev(pdev, ent, &via_driver); + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return ret; } -static void -via_pci_remove(struct pci_dev *pdev) +static void via_pci_remove(struct pci_dev *pdev) { struct drm_device *dev = pci_get_drvdata(pdev); + DRM_DEBUG_KMS("Entered %s.\n", __func__); drm_put_dev(dev); @@ -709,6 +717,8 @@ static struct pci_driver via_pci_driver = { static int __init via_init(void) { + int ret; + DRM_DEBUG_KMS("Entered %s.\n", __func__); via_driver.num_ioctls = via_max_ioctl; @@ -717,8 +727,10 @@ static int __init via_init(void) via_driver.driver_features |= DRIVER_MODESET; } + ret = pci_register_driver(&via_pci_driver); + DRM_DEBUG_KMS("Exiting %s.\n", __func__); - return pci_register_driver(&via_pci_driver); + return ret; } static void __exit via_exit(void) |