From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 12/15] vmwgfx: Remove initialisation of dev::devname Date: Mon, 27 Sep 2010 15:20:29 +0200 Message-ID: <1285593632-10585-13-git-send-email-thellstrom@vmware.com> References: <1285593632-10585-1-git-send-email-thellstrom@vmware.com> <1285593632-10585-2-git-send-email-thellstrom@vmware.com> <1285593632-10585-3-git-send-email-thellstrom@vmware.com> <1285593632-10585-4-git-send-email-thellstrom@vmware.com> <1285593632-10585-5-git-send-email-thellstrom@vmware.com> <1285593632-10585-6-git-send-email-thellstrom@vmware.com> <1285593632-10585-7-git-send-email-thellstrom@vmware.com> <1285593632-10585-8-git-send-email-thellstrom@vmware.com> <1285593632-10585-9-git-send-email-thellstrom@vmware.com> <1285593632-10585-10-git-send-email-thellstrom@vmware.com> <1285593632-10585-11-git-send-email-thellstrom@vmware.com> <1285593632-10585-12-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com [65.115.85.69]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F0B49EF23 for ; Mon, 27 Sep 2010 06:31:34 -0700 (PDT) In-Reply-To: <1285593632-10585-12-git-send-email-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: airlied@redhat.com Cc: Thomas Hellstrom , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org The removed code causes oopses with newer drms on master drop. Signed-off-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 0e5703a..b819535 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -148,7 +148,6 @@ static struct pci_device_id vmw_pci_id_list[] = { {0, 0, 0} }; -static char *vmw_devname = "vmwgfx"; static int enable_fbdev; static int vmw_probe(struct pci_dev *, const struct pci_device_id *); @@ -407,9 +406,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) "running the device in SVGA mode yet.\n"); } - if (!dev->devname) - dev->devname = vmw_devname; - if (dev_priv->capabilities & SVGA_CAP_IRQMASK) { ret = drm_irq_install(dev); if (unlikely(ret != 0)) { @@ -466,8 +462,6 @@ static int vmw_driver_unload(struct drm_device *dev) if (dev_priv->capabilities & SVGA_CAP_IRQMASK) drm_irq_uninstall(dev_priv->dev); - if (dev->devname == vmw_devname) - dev->devname = NULL; if (dev_priv->enable_fb) { vmw_fb_close(dev_priv); vmw_kms_restore_vga(dev_priv); -- 1.6.2.5