leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: arm/arm64: vgic-its: Remove kvm_its_unmap_device

Browse Source 
Let's remove kvm_its_unmap_device and use kvm_its_free_device
as both functions are identical.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
This commit is contained in:
Eric Auger 2017-10-26 17:23:07 +02:00 committed by Christoffer Dall
parent 4a2c4da125
commit 0a0d389ea6
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
virt/kvm/arm/vgic/vgic-its.c
View File

@ -897,7 +897,7 @@ static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its,
} }
/* Requires the its_lock to be held. */ /* Requires the its_lock to be held. */
static void vgic_its_unmap_device(struct kvm *kvm, struct its_device *device) static void vgic_its_free_device(struct kvm *kvm, struct its_device *device)
{ {
struct its_ite *ite, *temp; struct its_ite *ite, *temp;
@ -960,7 +960,7 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its,
* by removing the mapping and re-establishing it. * by removing the mapping and re-establishing it.
*/ */
if (device) if (device)
vgic_its_unmap_device(kvm, device); vgic_its_free_device(kvm, device);
/* /*
* The spec does not say whether unmapping a not-mapped device * The spec does not say whether unmapping a not-mapped device
@ -1615,16 +1615,6 @@ static int vgic_its_create(struct kvm_device *dev, u32 type)
return vgic_its_set_abi(its, NR_ITS_ABIS - 1); return vgic_its_set_abi(its, NR_ITS_ABIS - 1);
} }
static void vgic_its_free_device(struct kvm *kvm, struct its_device *dev)
{
struct its_ite *ite, *tmp;
list_for_each_entry_safe(ite, tmp, &dev->itt_head, ite_list)
its_free_ite(kvm, ite);
list_del(&dev->dev_list);
kfree(dev);
}
static void vgic_its_destroy(struct kvm_device *kvm_dev) static void vgic_its_destroy(struct kvm_device *kvm_dev)
{ {
struct kvm *kvm = kvm_dev->kvm; struct kvm *kvm = kvm_dev->kvm;