From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 May 2013 17:21:44 +0000 (-0700)
Subject: Merge tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: v3.10-rc1~35
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e15e6119062d20cc96f95c8b345e361589a90244;hp=-c;p=karo-tx-linux.git

Merge tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:
 "MSI:
      PCI: Set ->mask_pos correctly
  Hotplug:
      PCI: Delay final fixups until resources are assigned
  Moorestown:
      x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"

* tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Delay final fixups until resources are assigned
  x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0
  PCI: Set ->mask_pos correctly
---

e15e6119062d20cc96f95c8b345e361589a90244
diff --combined drivers/pci/probe.c
index 631aeb7d2d2d,67cd04575e2e..70f10fa3c1b2
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -990,6 -990,7 +990,6 @@@ int pci_setup_device(struct pci_dev *de
  	dev->sysdata = dev->bus->sysdata;
  	dev->dev.parent = dev->bus->bridge;
  	dev->dev.bus = &pci_bus_type;
 -	dev->dev.type = &pci_dev_type;
  	dev->hdr_type = hdr_type & 0x7f;
  	dev->multifunction = !!(hdr_type & 0x80);
  	dev->error_state = pci_channel_io_normal;
@@@ -1209,7 -1210,6 +1209,7 @@@ struct pci_dev *alloc_pci_dev(void
  		return NULL;
  
  	INIT_LIST_HEAD(&dev->bus_list);
 +	dev->dev.type = &pci_dev_type;
  
  	return dev;
  }
@@@ -1341,7 -1341,6 +1341,6 @@@ void pci_device_add(struct pci_dev *dev
  	list_add_tail(&dev->bus_list, &bus->devices);
  	up_write(&pci_bus_sem);
  
- 	pci_fixup_device(pci_fixup_final, dev);
  	ret = pcibios_add_device(dev);
  	WARN_ON(ret < 0);