Skip to content

Commit c09e22d

Browse files
committed
iommu: Rename struct iommu_device
The struct is used to link devices to iommu-groups, so 'struct group_device' is a better name. Further this makes the name iommu_device available for a struct representing hardware iommus. Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 534766d commit c09e22d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/iommu/iommu.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct iommu_group {
5555
struct iommu_domain *domain;
5656
};
5757

58-
struct iommu_device {
58+
struct group_device {
5959
struct list_head list;
6060
struct device *dev;
6161
char *name;
@@ -374,7 +374,7 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group,
374374
int iommu_group_add_device(struct iommu_group *group, struct device *dev)
375375
{
376376
int ret, i = 0;
377-
struct iommu_device *device;
377+
struct group_device *device;
378378

379379
device = kzalloc(sizeof(*device), GFP_KERNEL);
380380
if (!device)
@@ -460,7 +460,7 @@ EXPORT_SYMBOL_GPL(iommu_group_add_device);
460460
void iommu_group_remove_device(struct device *dev)
461461
{
462462
struct iommu_group *group = dev->iommu_group;
463-
struct iommu_device *tmp_device, *device = NULL;
463+
struct group_device *tmp_device, *device = NULL;
464464

465465
pr_info("Removing device %s from group %d\n", dev_name(dev), group->id);
466466

@@ -495,7 +495,7 @@ EXPORT_SYMBOL_GPL(iommu_group_remove_device);
495495

496496
static int iommu_group_device_count(struct iommu_group *group)
497497
{
498-
struct iommu_device *entry;
498+
struct group_device *entry;
499499
int ret = 0;
500500

501501
list_for_each_entry(entry, &group->devices, list)
@@ -518,7 +518,7 @@ static int iommu_group_device_count(struct iommu_group *group)
518518
static int __iommu_group_for_each_dev(struct iommu_group *group, void *data,
519519
int (*fn)(struct device *, void *))
520520
{
521-
struct iommu_device *device;
521+
struct group_device *device;
522522
int ret = 0;
523523

524524
list_for_each_entry(device, &group->devices, list) {

0 commit comments

Comments
 (0)