From: "tip-bot2 for Christoph Hellwig" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: x86/cleanups] x86/pci: Remove pci_64.h
Date: Fri, 15 Nov 2019 09:43:21 -0000 [thread overview]
Message-ID: <157381100181.29467.6264266348455981055.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191113071836.21041-3-hch@lst.de>
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 948fdcf94289b15f86ce8206abd92a3f7d12360a
Gitweb: https://git.kernel.org/tip/948fdcf94289b15f86ce8206abd92a3f7d12360a
Author: Christoph Hellwig <hch@lst.de>
AuthorDate: Wed, 13 Nov 2019 08:18:35 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 15 Nov 2019 10:36:59 +01:00
x86/pci: Remove pci_64.h
This file only contains external declarations for two non-existing
function pointers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20191113071836.21041-3-hch@lst.de
---
arch/x86/include/asm/pci.h | 4 ----
arch/x86/include/asm/pci_64.h | 14 --------------
2 files changed, 18 deletions(-)
delete mode 100644 arch/x86/include/asm/pci_64.h
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index e662f98..d9e28aa 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -120,10 +120,6 @@ void native_restore_msi_irqs(struct pci_dev *dev);
#endif
#endif /* __KERNEL__ */
-#ifdef CONFIG_X86_64
-#include <asm/pci_64.h>
-#endif
-
/* generic pci stuff */
#include <asm-generic/pci.h>
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h
deleted file mode 100644
index 4e1aef5..0000000
--- a/arch/x86/include/asm/pci_64.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_X86_PCI_64_H
-#define _ASM_X86_PCI_64_H
-
-#ifdef __KERNEL__
-
-extern int (*pci_config_read)(int seg, int bus, int dev, int fn,
- int reg, int len, u32 *value);
-extern int (*pci_config_write)(int seg, int bus, int dev, int fn,
- int reg, int len, u32 value);
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_X86_PCI_64_H */
next prev parent reply other threads:[~2019-11-15 9:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 7:18 Remove the calgary iommu driver Christoph Hellwig
2019-11-13 7:18 ` [PATCH 1/3] x86: Remove the calgary IOMMU driver Christoph Hellwig
2019-11-15 9:43 ` [tip: x86/cleanups] " tip-bot2 for Christoph Hellwig
2019-11-17 16:09 ` [PATCH 1/3] " Jon Mason
2019-11-13 7:18 ` [PATCH 2/3] x86/pci: Remove pci_64.h Christoph Hellwig
2019-11-15 9:43 ` tip-bot2 for Christoph Hellwig [this message]
2019-11-13 7:18 ` [PATCH 3/3] x86/pci: Remove #ifdef __KERNEL__ guard from <asm/pci.h> Christoph Hellwig
2019-11-15 9:43 ` [tip: x86/cleanups] " tip-bot2 for Christoph Hellwig
2019-11-17 16:06 ` Remove the calgary iommu driver Jon Mason
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=157381100181.29467.6264266348455981055.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®