From: Joerg Roedel <joerg.roedel@amd.com>
To: <iommu@lists.linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
Alex Williamson <alex.williamson@redhat.com>,
Ohad Ben-Cohen <ohad@wizery.com>,
David Woodhouse <dwmw2@infradead.org>,
David Brown <davidb@codeaurora.org>, <joro@8bytes.org>,
<linux-kernel@vger.kernel.org>,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 10/10] iommu/core: Remove global iommu_ops and register_iommu
Date: Fri, 23 Sep 2011 17:45:56 +0200 [thread overview]
Message-ID: <1316792756-3395-11-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1316792756-3395-1-git-send-email-joerg.roedel@amd.com>
With all IOMMU drivers being converted to bus_set_iommu the
global iommu_ops are no longer required. The same is true
for the deprecated register_iommu function.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
drivers/iommu/iommu.c | 27 ++++-----------------------
include/linux/iommu.h | 1 -
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 1575aaa..64419c8 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -25,16 +25,6 @@
#include <linux/errno.h>
#include <linux/iommu.h>
-static struct iommu_ops *iommu_ops;
-
-void register_iommu(struct iommu_ops *ops)
-{
- if (iommu_ops)
- BUG();
-
- iommu_ops = ops;
-}
-
static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
{
}
@@ -68,34 +58,25 @@ EXPORT_SYMBOL_GPL(bus_set_iommu);
bool iommu_present(struct bus_type *bus)
{
- if (bus->iommu_ops != NULL)
- return true;
- else
- return iommu_ops != NULL;
+ return bus->iommu_ops != NULL;
}
EXPORT_SYMBOL_GPL(iommu_present);
struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
{
struct iommu_domain *domain;
- struct iommu_ops *ops;
int ret;
- if (bus->iommu_ops)
- ops = bus->iommu_ops;
- else
- ops = iommu_ops;
-
- if (ops == NULL)
+ if (bus == NULL || bus->iommu_ops == NULL)
return NULL;
domain = kmalloc(sizeof(*domain), GFP_KERNEL);
if (!domain)
return NULL;
- domain->ops = ops;
+ domain->ops = bus->iommu_ops;
- ret = iommu_ops->domain_init(domain);
+ ret = domain->ops->domain_init(domain);
if (ret)
goto out_free;
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index f56e559..609ebf6 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -54,7 +54,6 @@ struct iommu_ops {
unsigned long cap);
};
-extern void register_iommu(struct iommu_ops *ops);
extern int bus_set_iommu(struct bus_type *bus, struct iommu_ops *ops);
extern bool iommu_present(struct bus_type *bus);
extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus);
--
1.7.4.1
next prev parent reply other threads:[~2011-09-23 15:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-23 15:45 [PATCH 0/10 v3] IOMMU: Make iommu_ops per-bus_type Joerg Roedel
2011-09-23 15:45 ` [PATCH 01/10] iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_API Joerg Roedel
2011-09-23 15:45 ` [PATCH 02/10] Driver core: Add iommu_ops to bus_type Joerg Roedel
2011-09-29 20:05 ` Greg KH
2011-09-30 6:24 ` Joerg Roedel
2011-09-30 13:58 ` Greg KH
2011-09-23 15:45 ` [PATCH 03/10] iommu/core: Add bus_type parameter to iommu_domain_alloc Joerg Roedel
2011-09-23 15:45 ` [PATCH 04/10] iommu/core: Convert iommu_found to iommu_present Joerg Roedel
2011-09-23 15:45 ` [PATCH 05/10] iommu/core: Use bus->iommu_ops in the iommu-api Joerg Roedel
2011-09-23 15:45 ` [PATCH 06/10] iommu/amd: Use bus_set_iommu instead of register_iommu Joerg Roedel
2011-09-23 15:45 ` [PATCH 07/10] iommu/vt-d: " Joerg Roedel
2011-09-23 15:45 ` [PATCH 08/10] iommu/omap: " Joerg Roedel
2011-09-26 7:09 ` Ohad Ben-Cohen
2011-09-26 12:22 ` Roedel, Joerg
2011-09-26 12:29 ` Ohad Ben-Cohen
2011-09-27 11:00 ` Roedel, Joerg
2011-09-27 11:10 ` Ohad Ben-Cohen
2011-09-27 11:20 ` KyongHo Cho
2011-09-29 20:04 ` Greg KH
2011-10-02 17:24 ` Ohad Ben-Cohen
2011-09-23 15:45 ` [PATCH 09/10] iommu/msm: " Joerg Roedel
2011-09-23 17:44 ` David Brown
2011-09-23 15:45 ` Joerg Roedel [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-22 16:14 [PATCH 0/10 v2] IOMMU: Make iommu_ops per-bus_type Joerg Roedel
2011-09-22 16:15 ` [PATCH 10/10] iommu/core: Remove global iommu_ops and register_iommu Joerg Roedel
2011-09-07 15:41 [PATCH 0/10] IOMMU: Make iommu_ops per-bus_type Joerg Roedel
2011-09-07 15:41 ` [PATCH 10/10] iommu/core: Remove global iommu_ops and register_iommu Joerg Roedel
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=1316792756-3395-11-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.com \
--cc=alex.williamson@redhat.com \
--cc=davidb@codeaurora.org \
--cc=dwmw2@infradead.org \
--cc=gregkh@suse.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ohad@wizery.com \
/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®