Skip to content

Commit

Permalink
PCI: IA64: convert pcibios_set_master() to a non-inlined function
Browse files Browse the repository at this point in the history
This patch converts IA64's architecture-specific 'pcibios_set_master()'
routine to a non-inlined function.  This will allow follow on
patches to create a generic 'pcibios_set_master()' function using the
'__weak' attribute which can be used by all architectures as a default
which, if necessary, can then be over-ridden by architecture-
specific code.

Converting 'pci_bios_set_master()' to a non-inlined function will allow
IA64's 'pcibios_set_master()' implementation to remain architecture-
specific after the generic version is introduced and thus, not change
current behavior.

No functional change.

Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Myron Stowe authored and Jesse Barnes committed Jan 6, 2012
1 parent 168c861 commit 91e86df
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
6 changes: 0 additions & 6 deletions arch/ia64/include/asm/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ struct pci_dev;
extern unsigned long ia64_max_iommu_merge_mask;
#define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask == ~0UL)

static inline void
pcibios_set_master (struct pci_dev *dev)
{
/* No special bus mastering setup handling */
}

static inline void
pcibios_penalize_isa_irq (int irq, int active)
{
Expand Down
5 changes: 5 additions & 0 deletions arch/ia64/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,11 @@ pcibios_fixup_bus (struct pci_bus *b)
return;
}

void pcibios_set_master (struct pci_dev *dev)
{
/* No special bus mastering setup handling */
}

void __devinit
pcibios_update_irq (struct pci_dev *dev, int irq)
{
Expand Down

0 comments on commit 91e86df

Please sign in to comment.