Commit b18d0a0f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

iommu: make the pointer to struct bus_type constant

A number of iommu functions take a struct bus_type * and never modify
the data passed in, so make them all const * as that is what the driver
core is expecting to have passed into as well.

This is a step toward making all struct bus_type pointers constant in
the kernel.

Cc: Will Deacon <will@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: iommu@lists.linux.dev
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20230313182918.1312597-34-gregkh@linuxfoundation.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3ea9fbc
...@@ -89,7 +89,7 @@ static int iommu_bus_notifier(struct notifier_block *nb, ...@@ -89,7 +89,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
unsigned long action, void *data); unsigned long action, void *data);
static int iommu_alloc_default_domain(struct iommu_group *group, static int iommu_alloc_default_domain(struct iommu_group *group,
struct device *dev); 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); unsigned type);
static int __iommu_attach_device(struct iommu_domain *domain, static int __iommu_attach_device(struct iommu_domain *domain,
struct device *dev); struct device *dev);
...@@ -1631,7 +1631,7 @@ static int iommu_get_def_domain_type(struct device *dev) ...@@ -1631,7 +1631,7 @@ static int iommu_get_def_domain_type(struct device *dev)
return 0; 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, struct iommu_group *group,
unsigned int type) unsigned int type)
{ {
...@@ -1777,7 +1777,7 @@ static int probe_get_default_domain_type(struct device *dev, void *data) ...@@ -1777,7 +1777,7 @@ static int probe_get_default_domain_type(struct device *dev, void *data)
return 0; 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 iommu_group *group)
{ {
struct __group_domain_type gtype; struct __group_domain_type gtype;
...@@ -1832,7 +1832,7 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group) ...@@ -1832,7 +1832,7 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group)
iommu_do_create_direct_mappings); 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; struct iommu_group *group, *next;
LIST_HEAD(group_list); LIST_HEAD(group_list);
...@@ -1876,7 +1876,7 @@ int bus_iommu_probe(struct bus_type *bus) ...@@ -1876,7 +1876,7 @@ int bus_iommu_probe(struct bus_type *bus)
return ret; return ret;
} }
bool iommu_present(struct bus_type *bus) bool iommu_present(const struct bus_type *bus)
{ {
return bus->iommu_ops != NULL; return bus->iommu_ops != NULL;
} }
...@@ -1951,7 +1951,7 @@ void iommu_set_fault_handler(struct iommu_domain *domain, ...@@ -1951,7 +1951,7 @@ void iommu_set_fault_handler(struct iommu_domain *domain,
} }
EXPORT_SYMBOL_GPL(iommu_set_fault_handler); 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) unsigned type)
{ {
struct iommu_domain *domain; struct iommu_domain *domain;
...@@ -1976,7 +1976,7 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus, ...@@ -1976,7 +1976,7 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
return domain; 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); return __iommu_domain_alloc(bus, IOMMU_DOMAIN_UNMANAGED);
} }
......
...@@ -455,11 +455,11 @@ static inline const struct iommu_ops *dev_iommu_ops(struct device *dev) ...@@ -455,11 +455,11 @@ static inline const struct iommu_ops *dev_iommu_ops(struct device *dev)
return dev->iommu->iommu_dev->ops; return dev->iommu->iommu_dev->ops;
} }
extern int bus_iommu_probe(struct bus_type *bus); extern int bus_iommu_probe(const struct bus_type *bus);
extern bool iommu_present(struct bus_type *bus); extern bool iommu_present(const struct bus_type *bus);
extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap); extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap);
extern bool iommu_group_has_isolated_msi(struct iommu_group *group); extern bool iommu_group_has_isolated_msi(struct iommu_group *group);
extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus); extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus);
extern struct iommu_group *iommu_group_get_by_id(int id); extern struct iommu_group *iommu_group_get_by_id(int id);
extern void iommu_domain_free(struct iommu_domain *domain); extern void iommu_domain_free(struct iommu_domain *domain);
extern int iommu_attach_device(struct iommu_domain *domain, extern int iommu_attach_device(struct iommu_domain *domain,
...@@ -732,7 +732,7 @@ struct iommu_device {}; ...@@ -732,7 +732,7 @@ struct iommu_device {};
struct iommu_fault_param {}; struct iommu_fault_param {};
struct iommu_iotlb_gather {}; struct iommu_iotlb_gather {};
static inline bool iommu_present(struct bus_type *bus) static inline bool iommu_present(const struct bus_type *bus)
{ {
return false; return false;
} }
...@@ -742,7 +742,7 @@ static inline bool device_iommu_capable(struct device *dev, enum iommu_cap cap) ...@@ -742,7 +742,7 @@ static inline bool device_iommu_capable(struct device *dev, enum iommu_cap cap)
return false; return false;
} }
static inline struct iommu_domain *iommu_domain_alloc(struct bus_type *bus) static inline struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus)
{ {
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment