Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / iommu / iommu.c

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 0025a631b8e1c6101366fa1cfd49dcf402875fe6..807c98de40d4f681045ef03af4e0f805642350a3 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -90,7 +90,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
                              unsigned long action, void *data);
 static int iommu_alloc_default_domain(struct iommu_group *group,
                                      struct device *dev);
-static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
+static struct iommu_domain *__iommu_domain_alloc(const struct bus_type *bus,
                                                 unsigned type);
 static int __iommu_attach_device(struct iommu_domain *domain,
                                 struct device *dev);
@@ -1635,7 +1635,7 @@ static int iommu_get_def_domain_type(struct device *dev)
        return 0;
 }
 
-static int iommu_group_alloc_default_domain(struct bus_type *bus,
+static int iommu_group_alloc_default_domain(const struct bus_type *bus,
                                            struct iommu_group *group,
                                            unsigned int type)
 {
@@ -1781,7 +1781,7 @@ static int probe_get_default_domain_type(struct device *dev, void *data)
        return 0;
 }
 
-static void probe_alloc_default_domain(struct bus_type *bus,
+static void probe_alloc_default_domain(const struct bus_type *bus,
                                       struct iommu_group *group)
 {
        struct __group_domain_type gtype;
@@ -1836,7 +1836,7 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group)
                                          iommu_do_create_direct_mappings);
 }
 
-int bus_iommu_probe(struct bus_type *bus)
+int bus_iommu_probe(const struct bus_type *bus)
 {
        struct iommu_group *group, *next;
        LIST_HEAD(group_list);
@@ -1880,7 +1880,7 @@ int bus_iommu_probe(struct bus_type *bus)
        return ret;
 }
 
-bool iommu_present(struct bus_type *bus)
+bool iommu_present(const struct bus_type *bus)
 {
        return bus->iommu_ops != NULL;
 }
@@ -1955,7 +1955,7 @@ void iommu_set_fault_handler(struct iommu_domain *domain,
 }
 EXPORT_SYMBOL_GPL(iommu_set_fault_handler);
 
-static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
+static struct iommu_domain *__iommu_domain_alloc(const struct bus_type *bus,
                                                 unsigned type)
 {
        struct iommu_domain *domain;
@@ -1980,7 +1980,7 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
        return domain;
 }
 
-struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
+struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus)
 {
        return __iommu_domain_alloc(bus, IOMMU_DOMAIN_UNMANAGED);
 }