lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
Dave
2006-07-18 04:01:01 +10:00
committed by Dave Airlie
parent 3d77461ecd
commit 242ef0e1e7
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/drm/drmP.h
View File

@@ -700,9 +700,6 @@ typedef struct drm_device {
struct pci_dev *pdev; /**< PCI device structure */ struct pci_dev *pdev; /**< PCI device structure */
int pci_domain; /**< PCI bus domain number */ int pci_domain; /**< PCI bus domain number */
int pci_bus; /**< PCI bus number */
int pci_slot; /**< PCI slot number */
int pci_func; /**< PCI function number */
#ifdef __alpha__ #ifdef __alpha__
struct pci_controller *hose; struct pci_controller *hose;
#endif #endif

9
drivers/char/drm/drm_ioctl.c
View File

@@ -128,8 +128,9 @@ int drm_setunique(struct inode *inode, struct file *filp,
bus &= 0xff; bus &= 0xff;
if ((domain != dev->pci_domain) || if ((domain != dev->pci_domain) ||
(bus != dev->pci_bus) || (bus != dev->pdev->bus->number) ||
(slot != dev->pci_slot) || (func != dev->pci_func)) (slot != PCI_SLOT(dev->pdev->devfn)) ||
(func != PCI_FUNC(dev->pdev->devfn)))
return -EINVAL; return -EINVAL;
return 0; return 0;
@@ -148,7 +149,9 @@ static int drm_set_busid(drm_device_t * dev)
return ENOMEM; return ENOMEM;
len = snprintf(dev->unique, dev->unique_len, "pci:%04x:%02x:%02x.%d", 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) if (len > dev->unique_len)
DRM_ERROR("Unique buffer overflowed\n"); DRM_ERROR("Unique buffer overflowed\n");

4
drivers/char/drm/drm_irq.c
View File

@@ -65,8 +65,8 @@ int drm_irq_by_busid(struct inode *inode, struct file *filp,
return -EFAULT; return -EFAULT;
if ((p.busnum >> 8) != dev->pci_domain || if ((p.busnum >> 8) != dev->pci_domain ||
(p.busnum & 0xff) != dev->pci_bus || (p.busnum & 0xff) != dev->pdev->bus->number ||
p.devnum != dev->pci_slot || p.funcnum != dev->pci_func) p.devnum != PCI_SLOT(dev->pdev->devfn) || p.funcnum != PCI_FUNC(dev->pdev->devfn))
return -EINVAL; return -EINVAL;
p.irq = dev->irq; p.irq = dev->irq;

3
drivers/char/drm/drm_stub.c
View File

@@ -72,9 +72,6 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
#else #else
dev->pci_domain = 0; dev->pci_domain = 0;
#endif #endif
dev->pci_bus = pdev->bus->number;
dev->pci_slot = PCI_SLOT(pdev->devfn);
dev->pci_func = PCI_FUNC(pdev->devfn);
dev->irq = pdev->irq; dev->irq = pdev->irq;
dev->maplist = drm_calloc(1, sizeof(*dev->maplist), DRM_MEM_MAPS); dev->maplist = drm_calloc(1, sizeof(*dev->maplist), DRM_MEM_MAPS);