summaryrefslogtreecommitdiffstats
path: root/drivers/pci/xen-pcifront.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 16:13:55 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 16:13:55 -0500
commitcff2f741b8ee8a70b208830e330de053efd4fc45 (patch)
tree83367ed74d889e2c8179f1f8b5d6f6f73b857982 /drivers/pci/xen-pcifront.c
parentb0885d01f9ab1274109c02942c881d598f939623 (diff)
parent92e9e6d1f9844b73a26215025a922e7d7aeae361 (diff)
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg Kroah-Hartman: "Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio update. * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits) modpost.c: Stop checking __dev* section mismatches init.h: Remove __dev* sections from the kernel acpi: remove use of __devinit PCI: Remove __dev* markings PCI: Always build setup-bus when PCI is enabled PCI: Move pci_uevent into pci-driver.c PCI: Remove CONFIG_HOTPLUG ifdefs unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs sh/PCI: Remove CONFIG_HOTPLUG ifdefs powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs mips/PCI: Remove CONFIG_HOTPLUG ifdefs microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs dma: remove use of __devinit dma: remove use of __devexit_p firewire: remove use of __devinitdata firewire: remove use of __devinit leds: remove use of __devexit leds: remove use of __devinit leds: remove use of __devexit_p mmc: remove use of __devexit ...
Diffstat (limited to 'drivers/pci/xen-pcifront.c')
-rw-r--r--drivers/pci/xen-pcifront.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 0aab85a51559..db542f4196a4 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -412,7 +412,7 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)
412 return 0; 412 return 0;
413} 413}
414 414
415static int __devinit pcifront_scan_bus(struct pcifront_device *pdev, 415static int pcifront_scan_bus(struct pcifront_device *pdev,
416 unsigned int domain, unsigned int bus, 416 unsigned int domain, unsigned int bus,
417 struct pci_bus *b) 417 struct pci_bus *b)
418{ 418{
@@ -441,7 +441,7 @@ static int __devinit pcifront_scan_bus(struct pcifront_device *pdev,
441 return 0; 441 return 0;
442} 442}
443 443
444static int __devinit pcifront_scan_root(struct pcifront_device *pdev, 444static int pcifront_scan_root(struct pcifront_device *pdev,
445 unsigned int domain, unsigned int bus) 445 unsigned int domain, unsigned int bus)
446{ 446{
447 struct pci_bus *b; 447 struct pci_bus *b;
@@ -503,7 +503,7 @@ err_out:
503 return err; 503 return err;
504} 504}
505 505
506static int __devinit pcifront_rescan_root(struct pcifront_device *pdev, 506static int pcifront_rescan_root(struct pcifront_device *pdev,
507 unsigned int domain, unsigned int bus) 507 unsigned int domain, unsigned int bus)
508{ 508{
509 int err; 509 int err;
@@ -834,7 +834,7 @@ out:
834 return err; 834 return err;
835} 835}
836 836
837static int __devinit pcifront_try_connect(struct pcifront_device *pdev) 837static int pcifront_try_connect(struct pcifront_device *pdev)
838{ 838{
839 int err = -EFAULT; 839 int err = -EFAULT;
840 int i, num_roots, len; 840 int i, num_roots, len;
@@ -924,7 +924,7 @@ out:
924 return err; 924 return err;
925} 925}
926 926
927static int __devinit pcifront_attach_devices(struct pcifront_device *pdev) 927static int pcifront_attach_devices(struct pcifront_device *pdev)
928{ 928{
929 int err = -EFAULT; 929 int err = -EFAULT;
930 int i, num_roots, len; 930 int i, num_roots, len;