commit 242ef0e1e7e5bb7e80c3620c1aa55168819d6fb8
author Dave <airlied@linux.ie> Tue Jul 18 04:01:01 2006 +1000
committer Dave Airlie <airlied@linux.ie> Fri Sep 22 05:32:30 2006 +1000
tree 759bc571c641b90271c306ee37c6dfff7daffca3
parent 3d77461ecd7fb92bb888f69478e3518b3c947ce3

drm: remove local copies of pci bus/slot/func

The drm keeps a local copy of these for little use.

Signed-off-by: Dave Airlie <airlied@linux.ie>

drivers/char/drm/drm_ioctl.c

diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
index 31dfe83..9f20c2b 100644
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
@@ -128,8 +128,9 @@
 	bus &= 0xff;
 
 	if ((domain != dev->pci_domain) ||
-	    (bus != dev->pci_bus) ||
-	    (slot != dev->pci_slot) || (func != dev->pci_func))
+	    (bus != dev->pdev->bus->number) ||
+	    (slot != PCI_SLOT(dev->pdev->devfn)) ||
+	    (func != PCI_FUNC(dev->pdev->devfn)))
 		return -EINVAL;
 
 	return 0;
@@ -148,7 +149,9 @@
 		return ENOMEM;
 
 	len = snprintf(dev->unique, dev->unique_len, "pci:%04x:%02x:%02x.%d",
-		 dev->pci_domain, dev->pci_bus, dev->pci_slot, dev->pci_func);
+		       dev->pci_domain, dev->pdev->bus->number,
+		       PCI_SLOT(dev->pdev->devfn),
+		       PCI_FUNC(dev->pdev->devfn));
 
 	if (len > dev->unique_len)
 		DRM_ERROR("Unique buffer overflowed\n");