drm: rework PCI/platform driver interface.

This abstracts the pci/platform interface out a step further,
we can go further but this is far enough for now to allow USB
to be plugged in.

The drivers now just call the init code directly for their
device type.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 4caf5d01cfd3..46d5be6e97e5 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -82,10 +82,6 @@ static struct drm_driver driver = {
                  .fasync = drm_fasync,
                  .llseek = noop_llseek,
         },
-        .pci_driver = {
-                 .name = DRIVER_NAME,
-                 .id_table = pciidlist,
-        },
 
         .name = DRIVER_NAME,
         .desc = DRIVER_DESC,
@@ -95,15 +91,20 @@ static struct drm_driver driver = {
         .patchlevel = DRIVER_PATCHLEVEL,
 };
 
+static struct pci_driver sis_pci_driver = {
+        .name = DRIVER_NAME,
+        .id_table = pciidlist,
+};
+
 static int __init sis_init(void)
 {
         driver.num_ioctls = sis_max_ioctl;
-        return drm_init(&driver);
+        return drm_pci_init(&driver, &sis_pci_driver);
 }
 
 static void __exit sis_exit(void)
 {
-        drm_exit(&driver);
+        drm_pci_exit(&driver, &sis_pci_driver);
 }
 
 module_init(sis_init);