Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 242ef0e1 authored by Dave's avatar Dave Committed by Dave Airlie
Browse files

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



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

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 3d77461e

drivers/char/drm/drmP.h

+0 −3
Original line number Diff line number Diff line
@@ -700,9 +700,6 @@ typedef struct drm_device { 


	struct pci_dev *pdev;		/**< PCI device structure */

	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__

	struct pci_controller *hose;

#endif

drivers/char/drm/drm_ioctl.c

+6 −3
Original line number Diff line number Diff line
@@ -128,8 +128,9 @@ int drm_setunique(struct inode *inode, struct file *filp, 
	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 @@ static int drm_set_busid(drm_device_t * dev) 
		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");

drivers/char/drm/drm_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ int drm_irq_by_busid(struct inode *inode, struct file *filp, 
		return -EFAULT;



	if ((p.busnum >> 8) != dev->pci_domain ||

	    (p.busnum & 0xff) != dev->pci_bus ||

	    p.devnum != dev->pci_slot || p.funcnum != dev->pci_func)

	    (p.busnum & 0xff) != dev->pdev->bus->number ||

	    p.devnum != PCI_SLOT(dev->pdev->devfn) || p.funcnum != PCI_FUNC(dev->pdev->devfn))

		return -EINVAL;



	p.irq = dev->irq;

drivers/char/drm/drm_stub.c

+0 −3
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, 
#else

	dev->pci_domain = 0;

#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->maplist = drm_calloc(1, sizeof(*dev->maplist), DRM_MEM_MAPS);