diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-03 15:48:48 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-23 04:32:52 -0400 |
commit | 5829d1834e5486e83547f36576b160023c9609c2 (patch) | |
tree | 0c8adba7b179e4bd5336e434d1661a2202858624 /drivers/gpu/drm/drm_irq.c | |
parent | 53bf2a2bca9b56e23fa8862159c75868672d7f1e (diff) |
drm: rip out dev->devname
This was only ever used to pretty-print the irq driver name. And on
kms systems due to set_version bonghits we never set up the prettier
name, ever. Which make this a bit pointless.
Also, we can always dig out the driver-instance/irq relationship
through other means, so this isn't that useful. So just rip it out to
simplify the set_version/set_busid insanity a bit.
Also delete the temporary busname from drm_pci_set_busid, it's now
unused.
v2: Rebase on top of the new host1x drm_bus for tegra.
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
-rw-r--r-- | drivers/gpu/drm/drm_irq.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index de38bc9b6581..7583767ec619 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
@@ -246,7 +246,6 @@ int drm_irq_install(struct drm_device *dev, int irq) | |||
246 | { | 246 | { |
247 | int ret; | 247 | int ret; |
248 | unsigned long sh_flags = 0; | 248 | unsigned long sh_flags = 0; |
249 | char *irqname; | ||
250 | 249 | ||
251 | if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) | 250 | if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) |
252 | return -EINVAL; | 251 | return -EINVAL; |
@@ -272,13 +271,8 @@ int drm_irq_install(struct drm_device *dev, int irq) | |||
272 | if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED)) | 271 | if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED)) |
273 | sh_flags = IRQF_SHARED; | 272 | sh_flags = IRQF_SHARED; |
274 | 273 | ||
275 | if (dev->devname) | ||
276 | irqname = dev->devname; | ||
277 | else | ||
278 | irqname = dev->driver->name; | ||
279 | |||
280 | ret = request_irq(irq, dev->driver->irq_handler, | 274 | ret = request_irq(irq, dev->driver->irq_handler, |
281 | sh_flags, irqname, dev); | 275 | sh_flags, dev->driver->name, dev); |
282 | 276 | ||
283 | if (ret < 0) { | 277 | if (ret < 0) { |
284 | dev->irq_enabled = false; | 278 | dev->irq_enabled = false; |