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

Commit 85a00dd3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/myron-pcibios_setup' into next 

* pci/myron-pcibios_setup:
  xtensa/PCI: factor out pcibios_setup()
  x86/PCI: adjust section annotations for pcibios_setup()
  unicore32/PCI: adjust section annotations for pcibios_setup()
  tile/PCI: factor out pcibios_setup()
  sparc/PCI: factor out pcibios_setup()
  sh/PCI: adjust section annotations for pcibios_setup()
  sh/PCI: factor out pcibios_setup()
  powerpc/PCI: factor out pcibios_setup()
  parisc/PCI: factor out pcibios_setup()
  MIPS/PCI: adjust section annotations for pcibios_setup()
  MIPS/PCI: factor out pcibios_setup()
  microblaze/PCI: factor out pcibios_setup()
  ia64/PCI: factor out pcibios_setup()
  cris/PCI: factor out pcibios_setup()
  alpha/PCI: factor out pcibios_setup()
  PCI: pull pcibios_setup() up into core
parents 35e7f73c 29e8d7bf

arch/alpha/kernel/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -195,12 +195,6 @@ pcibios_init(void) 


subsys_initcall(pcibios_init);



char * __devinit

pcibios_setup(char *str)

{

	return str;

}



#ifdef ALPHA_RESTORE_SRM_SETUP

static struct pdev_srm_saved_conf *srm_saved_configs;

arch/cris/arch-v32/drivers/pci/bios.c

+0 −5
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) 
{

}



char * __devinit  pcibios_setup(char *str)

{

	return NULL;

}



void pcibios_set_master(struct pci_dev *dev)

{

	u8 lat;

arch/ia64/pci/pci.c

+0 −9
Original line number Diff line number Diff line
@@ -498,15 +498,6 @@ pcibios_align_resource (void *data, const struct resource *res, 
	return res->start;

}



/*

 * PCI BIOS setup, always defaults to SAL interface

 */

char * __init

pcibios_setup (char *str)

{

	return str;

}



int

pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,

		     enum pci_mmap_state mmap_state, int write_combine)

arch/microblaze/pci/pci-common.c

+0 −5
Original line number Diff line number Diff line
@@ -192,11 +192,6 @@ void pcibios_set_master(struct pci_dev *dev) 
	/* No special bus mastering setup handling */

}



char __devinit *pcibios_setup(char *str)

{

	return str;

}



/*

 * Reads the interrupt pin to determine if interrupt is use by card.

 * If the interrupt is used, then gets the interrupt line from the

arch/mips/pci/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -348,9 +348,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 
		vma->vm_end - vma->vm_start, vma->vm_page_prot);

}



char * (*pcibios_plat_setup)(char *str) __devinitdata;

char * (*pcibios_plat_setup)(char *str) __initdata;



char *__devinit pcibios_setup(char *str)

char *__init pcibios_setup(char *str)

{

	if (pcibios_plat_setup)

		return pcibios_plat_setup(str);