drm: kill drm_bus->bus_type

Completely unused. Hooray, midlayer mistakes that didn't cause work to
undo!

v2: Rebase on top of the recent tegra changes which added a host1x drm
bus.

Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 8d4221683af463e7e778389ced6d8da60e7e575c..08c76af920d67cf93437295feb8f33e711fe2967 100644 (file)
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -317,7 +317,6 @@ void drm_pci_agp_destroy(struct drm_device *dev)
 }
 
 static struct drm_bus drm_pci_bus = {
-       .bus_type = DRIVER_BUS_PCI,
        .get_irq = drm_pci_get_irq,
        .get_name = drm_pci_get_name,
        .set_busid = drm_pci_set_busid,

diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index 319ff538560119beda233eaff71d007d7aae3897..5cd8c695824f7299b20ef9acabb0ed09211f87a3 100644 (file)
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c
@@ -123,7 +123,6 @@ err:
 }
 
 static struct drm_bus drm_platform_bus = {
-       .bus_type = DRIVER_BUS_PLATFORM,
        .get_irq = drm_platform_get_irq,
        .get_name = drm_platform_get_name,
        .set_busid = drm_platform_set_busid,

diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c
index c3406aad294463718ccdaf1d83fc7636a0322b17..ed60f887c80584674f8643d17bf01feee5597607 100644 (file)
--- a/drivers/gpu/drm/drm_usb.c
+++ b/drivers/gpu/drm/drm_usb.c
@@ -53,7 +53,6 @@ static int drm_usb_set_busid(struct drm_device *dev,
 }
 
 static struct drm_bus drm_usb_bus = {
-       .bus_type = DRIVER_BUS_USB,
        .get_irq = drm_usb_get_irq,
        .get_name = drm_usb_get_name,
        .set_busid = drm_usb_set_busid,

diff --git a/drivers/gpu/drm/tegra/bus.c b/drivers/gpu/drm/tegra/bus.c
index 71cef5c13dc81d0f01cf7c05acae927ef2ab18de..6916fa51cfa481761bec0083bde68163c61cd22c 100644 (file)
--- a/drivers/gpu/drm/tegra/bus.c
+++ b/drivers/gpu/drm/tegra/bus.c
@@ -37,7 +37,6 @@ static int drm_host1x_set_busid(struct drm_device *dev,
 }
 
 static struct drm_bus drm_host1x_bus = {
-       .bus_type = DRIVER_BUS_HOST1X,
        .set_busid = drm_host1x_set_busid,
 };
 

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 41839ea0c1eed5bea74692072efeeb158a1f9dcb..9f1fb8d36b67be6efef3195c33fbcd95d9429c0e 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -143,11 +143,6 @@ int drm_err(const char *func, const char *format, ...);
 #define DRIVER_PRIME       0x4000
 #define DRIVER_RENDER      0x8000
 
-#define DRIVER_BUS_PCI 0x1
-#define DRIVER_BUS_PLATFORM 0x2
-#define DRIVER_BUS_USB 0x3
-#define DRIVER_BUS_HOST1X 0x4
-
 /***********************************************************************/
 /** \name Begin the DRM... */
 /*@{*/
@@ -731,7 +726,6 @@ struct drm_master {
 #define DRM_SCANOUTPOS_ACCURATE     (1 << 2)
 
 struct drm_bus {
-       int bus_type;
        int (*get_irq)(struct drm_device *dev);
        const char *(*get_name)(struct drm_device *dev);
        int (*set_busid)(struct drm_device *dev, struct drm_master *master);