mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Myron Stowe <myron.stowe@redhat.com>
To: jbarnes@virtuousgeek.org
Cc: linux-pci@vger.kernel.org, linux@arm.linux.org.uk,
	vapier@gentoo.org, dhowells@redhat.com,
	ysato@users.sourceforge.jp, tony.luck@intel.com,
	fenghua.yu@intel.com, monstr@monstr.eu, ralf@linux-mips.org,
	benh@kernel.crashing.org, paulus@samba.org, lethal@linux-sh.org,
	davem@davemloft.net, cmetcalf@tilera.com, gxt@mprc.pku.edu.cn,
	tglx@linutronix.de, mingo@redhat.com, chris@zankel.net,
	linux-kernel@vger.kernel.org
Subject: [PATCH -v2 03/16] PCI: IA64: convert pcibios_set_master() to a non-inlined function
Date: Fri, 28 Oct 2011 15:47:49 -0600	[thread overview]
Message-ID: <20111028214749.20088.61354.stgit@amt.stowe> (raw)
In-Reply-To: <20111028214726.20088.30551.stgit@amt.stowe>

From: Myron Stowe <mstowe@redhat.com>

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>
---

 arch/ia64/include/asm/pci.h |    6 ------
 arch/ia64/pci/pci.c         |    5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 73b5f78..6e3d91e 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -43,12 +43,6 @@ 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)
 {
 	/* We don't do dynamic PCI IRQ allocation */
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index aa2533a..8273acb 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -513,6 +513,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)
 {


  parent reply	other threads:[~2011-10-28 21:48 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-28 21:47 [PATCH -v2 00/16] PCI: Re-factor PCI's 'latency timer' setup Myron Stowe
2011-10-28 21:47 ` [PATCH -v2 01/16] PCI: add declaration for pcibios_set_master() to pci core Myron Stowe
2011-12-05 19:06   ` Jesse Barnes
2011-12-05 20:32     ` Benjamin Herrenschmidt
2011-10-28 21:47 ` [PATCH -v2 02/16] PCI: ARM: convert pcibios_set_master() to a non-inlined function Myron Stowe
2011-10-28 21:47 ` Myron Stowe [this message]
2011-10-28 21:47 ` [PATCH -v2 04/16] PCI: MicroBlaze: " Myron Stowe
2011-10-28 21:48 ` [PATCH -v2 05/16] PCI: PowerPC: " Myron Stowe
2011-10-28 21:48 ` [PATCH -v2 06/16] PCI: SPARC: " Myron Stowe
2011-10-28 21:48 ` [PATCH -v2 07/16] PCI: TILE: " Myron Stowe
2011-10-31 15:27   ` Chris Metcalf
2011-10-28 21:48 ` [PATCH -v2 08/16] PCI: UniCore: " Myron Stowe
2011-10-28 21:48 ` [PATCH -v2 09/16] PCI: Xtensa: " Myron Stowe
2011-10-28 21:48 ` [PATCH -v2 10/16] PCI: Pull PCI 'latency timer' setup up into the core Myron Stowe
2011-10-28 21:48 ` [PATCH -v2 11/16] PCI: frv: use generic pcibios_set_master() Myron Stowe
2011-10-28 21:48 ` [PATCH -v2 12/16] PCI: MIPS: " Myron Stowe
2011-10-28 21:48 ` [PATCH -v2 13/16] PCI: mn10300: " Myron Stowe
2011-10-28 21:49 ` [PATCH -v2 14/16] PCI: sh: " Myron Stowe
2011-10-28 21:49 ` [PATCH -v2 15/16] PCI: x86: " Myron Stowe
2011-10-28 21:49 ` [PATCH -v2 16/16] PCI: latency timer doesn't apply to PCIe Myron Stowe
2011-10-29  0:46 ` [PATCH -v2 00/16] PCI: Re-factor PCI's 'latency timer' setup Mike Frysinger
2011-10-31 16:08   ` Myron Stowe
2011-10-31 23:14   ` Myron Stowe
2011-11-11 17:59 ` Jesse Barnes
2011-11-15 22:43   ` Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111028214749.20088.61354.stgit@amt.stowe \
    --to=myron.stowe@redhat.com \
    --cc=benh@kernel.crashing.org \
    --cc=chris@zankel.net \
    --cc=cmetcalf@tilera.com \
    --cc=davem@davemloft.net \
    --cc=dhowells@redhat.com \
    --cc=fenghua.yu@intel.com \
    --cc=gxt@mprc.pku.edu.cn \
    --cc=jbarnes@virtuousgeek.org \
    --cc=lethal@linux-sh.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mingo@redhat.com \
    --cc=monstr@monstr.eu \
    --cc=paulus@samba.org \
    --cc=ralf@linux-mips.org \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=vapier@gentoo.org \
    --cc=ysato@users.sourceforge.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome