diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-03 15:13:09 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-23 04:32:51 -0400 |
commit | b2a21aa25a39837d06eb24a7f0fef1733f9843eb (patch) | |
tree | 3b16f920191dae6506b9f50a733ff614ff05831a | |
parent | bb0f1b5c1695b4399cfd2359c114ae63edbb3ad8 (diff) |
drm: remove bus->get_irq implementations
Now that they're all unused we can get rid of them, including the
dummy version in drm_usb.c.
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/drm_pci.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_platform.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_usb.c | 6 | ||||
-rw-r--r-- | include/drm/drmP.h | 1 |
4 files changed, 0 insertions, 19 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 08c76af920d6..eff29e311f70 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c | |||
@@ -137,11 +137,6 @@ static int drm_get_pci_domain(struct drm_device *dev) | |||
137 | return pci_domain_nr(dev->pdev->bus); | 137 | return pci_domain_nr(dev->pdev->bus); |
138 | } | 138 | } |
139 | 139 | ||
140 | static int drm_pci_get_irq(struct drm_device *dev) | ||
141 | { | ||
142 | return dev->pdev->irq; | ||
143 | } | ||
144 | |||
145 | static const char *drm_pci_get_name(struct drm_device *dev) | 140 | static const char *drm_pci_get_name(struct drm_device *dev) |
146 | { | 141 | { |
147 | struct pci_driver *pdriver = dev->driver->kdriver.pci; | 142 | struct pci_driver *pdriver = dev->driver->kdriver.pci; |
@@ -317,7 +312,6 @@ void drm_pci_agp_destroy(struct drm_device *dev) | |||
317 | } | 312 | } |
318 | 313 | ||
319 | static struct drm_bus drm_pci_bus = { | 314 | static struct drm_bus drm_pci_bus = { |
320 | .get_irq = drm_pci_get_irq, | ||
321 | .get_name = drm_pci_get_name, | 315 | .get_name = drm_pci_get_name, |
322 | .set_busid = drm_pci_set_busid, | 316 | .set_busid = drm_pci_set_busid, |
323 | .set_unique = drm_pci_set_unique, | 317 | .set_unique = drm_pci_set_unique, |
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c index 5cd8c695824f..5b918212b1c3 100644 --- a/drivers/gpu/drm/drm_platform.c +++ b/drivers/gpu/drm/drm_platform.c | |||
@@ -68,11 +68,6 @@ err_free: | |||
68 | return ret; | 68 | return ret; |
69 | } | 69 | } |
70 | 70 | ||
71 | static int drm_platform_get_irq(struct drm_device *dev) | ||
72 | { | ||
73 | return platform_get_irq(dev->platformdev, 0); | ||
74 | } | ||
75 | |||
76 | static const char *drm_platform_get_name(struct drm_device *dev) | 71 | static const char *drm_platform_get_name(struct drm_device *dev) |
77 | { | 72 | { |
78 | return dev->platformdev->name; | 73 | return dev->platformdev->name; |
@@ -123,7 +118,6 @@ err: | |||
123 | } | 118 | } |
124 | 119 | ||
125 | static struct drm_bus drm_platform_bus = { | 120 | static struct drm_bus drm_platform_bus = { |
126 | .get_irq = drm_platform_get_irq, | ||
127 | .get_name = drm_platform_get_name, | 121 | .get_name = drm_platform_get_name, |
128 | .set_busid = drm_platform_set_busid, | 122 | .set_busid = drm_platform_set_busid, |
129 | }; | 123 | }; |
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c index ed60f887c805..abdc265c9cc8 100644 --- a/drivers/gpu/drm/drm_usb.c +++ b/drivers/gpu/drm/drm_usb.c | |||
@@ -36,11 +36,6 @@ err_free: | |||
36 | } | 36 | } |
37 | EXPORT_SYMBOL(drm_get_usb_dev); | 37 | EXPORT_SYMBOL(drm_get_usb_dev); |
38 | 38 | ||
39 | static int drm_usb_get_irq(struct drm_device *dev) | ||
40 | { | ||
41 | return 0; | ||
42 | } | ||
43 | |||
44 | static const char *drm_usb_get_name(struct drm_device *dev) | 39 | static const char *drm_usb_get_name(struct drm_device *dev) |
45 | { | 40 | { |
46 | return "USB"; | 41 | return "USB"; |
@@ -53,7 +48,6 @@ static int drm_usb_set_busid(struct drm_device *dev, | |||
53 | } | 48 | } |
54 | 49 | ||
55 | static struct drm_bus drm_usb_bus = { | 50 | static struct drm_bus drm_usb_bus = { |
56 | .get_irq = drm_usb_get_irq, | ||
57 | .get_name = drm_usb_get_name, | 51 | .get_name = drm_usb_get_name, |
58 | .set_busid = drm_usb_set_busid, | 52 | .set_busid = drm_usb_set_busid, |
59 | }; | 53 | }; |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 7a7cfe88b9bf..f4d0eaa3da46 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -726,7 +726,6 @@ struct drm_master { | |||
726 | #define DRM_SCANOUTPOS_ACCURATE (1 << 2) | 726 | #define DRM_SCANOUTPOS_ACCURATE (1 << 2) |
727 | 727 | ||
728 | struct drm_bus { | 728 | struct drm_bus { |
729 | int (*get_irq)(struct drm_device *dev); | ||
730 | const char *(*get_name)(struct drm_device *dev); | 729 | const char *(*get_name)(struct drm_device *dev); |
731 | int (*set_busid)(struct drm_device *dev, struct drm_master *master); | 730 | int (*set_busid)(struct drm_device *dev, struct drm_master *master); |
732 | int (*set_unique)(struct drm_device *dev, struct drm_master *master, | 731 | int (*set_unique)(struct drm_device *dev, struct drm_master *master, |