KVM/arm64: vgic-its: Make ABI commit helpers return void
PATCH v2 1/1 KVM/arm64: vgic-its: Make ABI commit helpers return void
From: Jackie Liu <[email protected]>
The return values of vgic_its_set_abi() and vgic_its_commit_v0() are always 0 and do not carry useful error information. Simplify by changing them to void.
Suggested-by Oliver Upton <[email protected]>
Signed-off-by Jackie Liu <[email protected]>
--- arch/arm64/kvm/vgic/vgic-its.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
arch/arm64/kvm/vgic/vgic-its.c +9 -12
@@ -27,7 +27,7 @@ static struct kvm_device_ops kvm_arm_vgic_its_ops;static int vgic_its_save_tables_v0 (struct vgic_its *its);static int vgic_its_restore_tables_v0 (struct vgic_its *its); -static int vgic_its_commit_v0 (struct vgic_its *its); +static void vgic_its_commit_v0 (struct vgic_its *its);static int update_lpi_config (struct kvm *kvm,struct vgic_irq *irq,struct kvm_vcpu *filter_vcpu,bool needs_inv);
@@ -168,7 +168,7 @@ struct vgic_its_abi {int ite_esz;int (*save_tables)(struct vgic_its *its);int (*restore_tables)(struct vgic_its *its); -int (*commit)(struct vgic_its *its); +void (*commit)(struct vgic_its *its); };#define ABI_0_ESZ 8
@@ -192,13 +192,13 @@ inline const struct vgic_its_abi *vgic_its_get_abi(struct vgic_its *its)return &its_table_abi_versions[its->abi_rev]; } -static int vgic_its_set_abi (struct vgic_its *its,u32 rev) +static void vgic_its_set_abi (struct vgic_its *its,u32 rev) {const struct vgic_its_abi *abi; its->abi_rev = rev; abi =vgic_its_get_abi (its); -return abi->commit (its); + abi->commit (its); }/*
@@ -472,7 +472,8 @@ static int vgic_mmio_uaccess_write_its_iidr(struct kvm *kvm,if (rev >=NR_ITS_ABIS )return -EINVAL ; -return vgic_its_set_abi (its, rev); +vgic_its_set_abi (its, rev); +return 0 ; } static unsigned long vgic_mmio_read_its_idregs(struct kvm *kvm,
@@ -1888,14 +1889,11 @@ static int vgic_its_create(struct kvm_device *dev, u32 type) its->baser_coll_table =INITIAL_BASER_VALUE | ((u64 )GITS_BASER_TYPE_COLLECTION <<GITS_BASER_TYPE_SHIFT ); dev->kvm->arch.vgic.propbaser =INITIAL_PROPBASER_VALUE ; - dev->private = its; - ret =vgic_its_set_abi (its,NR_ITS_ABIS -1 ); - +vgic_its_set_abi (its,NR_ITS_ABIS -1 );mutex_unlock (&dev->kvm->arch.config_lock); - -return ret; +return 0 ; }static void vgic_its_destroy (struct kvm_device *kvm_dev)
@@ -2610,7 +2608,7 @@ static int vgic_its_restore_tables_v0(struct vgic_its *its)return ret; } -static int vgic_its_commit_v0 (struct vgic_its *its) +static void vgic_its_commit_v0 (struct vgic_its *its) {const struct vgic_its_abi *abi;
@@ -2623,7 +2621,6 @@ static int vgic_its_commit_v0(struct vgic_its *its) its->baser_device_table |= (GIC_ENCODE_SZ (abi->dte_esz,5 ) <<GITS_BASER_ENTRY_SIZE_SHIFT ); -return 0 ; }static void vgic_its_reset (struct kvm *kvm,struct vgic_its *its)
Signature · 1 line
2.54.0
Hi Jackie,
Quoted 8 lines · Jackie Liu
From: Jackie Liu <[email protected]>
The return values of
vgic_its_set_abi()andvgic_its_commit_v0()are always 0 and do not carry useful error information. Simplify by changing them to void.Suggested-by Oliver Upton <[email protected]>Signed-off-by Jackie Liu <[email protected]>
Reviewed-by Eric Auger <[email protected]>
Thanks
Eric
Quoted 86 lines
--- arch/arm64/kvm/vgic/vgic-its.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)arch/arm64/kvm/vgic/vgic-its.c +9
-12@@ -27,7 +27,7 @@ static struct kvm_device_ops kvm_arm_vgic_its_ops;static int vgic_its_save_tables_v0 (struct vgic_its *its);static int vgic_its_restore_tables_v0 (struct vgic_its *its); -static int vgic_its_commit_v0 (struct vgic_its *its); +static void vgic_its_commit_v0 (struct vgic_its *its);static int update_lpi_config (struct kvm *kvm,struct vgic_irq *irq,struct kvm_vcpu *filter_vcpu,bool needs_inv);@@ -168,7 +168,7 @@ struct vgic_its_abi {int ite_esz;int (*save_tables)(struct vgic_its *its);int (*restore_tables)(struct vgic_its *its); -int (*commit)(struct vgic_its *its); +void (*commit)(struct vgic_its *its); };#define ABI_0_ESZ 8@@ -192,13 +192,13 @@ inline const struct vgic_its_abi *vgic_its_get_abi(struct vgic_its *its)return &its_table_abi_versions[its->abi_rev]; } -static int vgic_its_set_abi (struct vgic_its *its,u32 rev) +static void vgic_its_set_abi (struct vgic_its *its,u32 rev) {const struct vgic_its_abi *abi; its->abi_rev = rev; abi =vgic_its_get_abi (its); -return abi->commit (its); + abi->commit (its); }/* @@ -472,7 +472,8 @@ static int vgic_mmio_uaccess_write_its_iidr(struct kvm *kvm,if (rev >=NR_ITS_ABIS )return -EINVAL ; -return vgic_its_set_abi (its, rev); +vgic_its_set_abi (its, rev); +return 0 ; } static unsigned long vgic_mmio_read_its_idregs(struct kvm *kvm,@@ -1888,14 +1889,11 @@ static int vgic_its_create(struct kvm_device *dev, u32 type) its->baser_coll_table =INITIAL_BASER_VALUE | ((u64 )GITS_BASER_TYPE_COLLECTION <<GITS_BASER_TYPE_SHIFT ); dev->kvm->arch.vgic.propbaser =INITIAL_PROPBASER_VALUE ; - dev->private = its; - ret =vgic_its_set_abi (its,NR_ITS_ABIS -1 ); - +vgic_its_set_abi (its,NR_ITS_ABIS -1 );mutex_unlock (&dev->kvm->arch.config_lock); - -return ret; +return 0 ; }static void vgic_its_destroy (struct kvm_device *kvm_dev)@@ -2610,7 +2608,7 @@ static int vgic_its_restore_tables_v0(struct vgic_its *its)return ret; } -static int vgic_its_commit_v0 (struct vgic_its *its) +static void vgic_its_commit_v0 (struct vgic_its *its) {const struct vgic_its_abi *abi;@@ -2623,7 +2621,6 @@ static int vgic_its_commit_v0(struct vgic_its *its) its->baser_device_table |= (GIC_ENCODE_SZ (abi->dte_esz,5 ) <<GITS_BASER_ENTRY_SIZE_SHIFT ); -return 0 ; }static void vgic_its_reset (struct kvm *kvm,struct vgic_its *its)
Quoted 8 lines · Jackie Liu
From: Jackie Liu <[email protected]>
The return values of
vgic_its_set_abi()andvgic_its_commit_v0()are always 0 and do not carry useful error information. Simplify by changing them to void.Suggested-by Oliver Upton <[email protected]>Signed-off-by Jackie Liu <[email protected]>
Reviewed-by Oliver Upton <[email protected]>
Thanks,
Oliver
Quoted 90 lines
--- arch/arm64/kvm/vgic/vgic-its.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)arch/arm64/kvm/vgic/vgic-its.c +9
-12@@ -27,7 +27,7 @@ static struct kvm_device_ops kvm_arm_vgic_its_ops;static int vgic_its_save_tables_v0 (struct vgic_its *its);static int vgic_its_restore_tables_v0 (struct vgic_its *its); -static int vgic_its_commit_v0 (struct vgic_its *its); +static void vgic_its_commit_v0 (struct vgic_its *its);static int update_lpi_config (struct kvm *kvm,struct vgic_irq *irq,struct kvm_vcpu *filter_vcpu,bool needs_inv);@@ -168,7 +168,7 @@ struct vgic_its_abi {int ite_esz;int (*save_tables)(struct vgic_its *its);int (*restore_tables)(struct vgic_its *its); -int (*commit)(struct vgic_its *its); +void (*commit)(struct vgic_its *its); };#define ABI_0_ESZ 8@@ -192,13 +192,13 @@ inline const struct vgic_its_abi *vgic_its_get_abi(struct vgic_its *its)return &its_table_abi_versions[its->abi_rev]; } -static int vgic_its_set_abi (struct vgic_its *its,u32 rev) +static void vgic_its_set_abi (struct vgic_its *its,u32 rev) {const struct vgic_its_abi *abi; its->abi_rev = rev; abi =vgic_its_get_abi (its); -return abi->commit (its); + abi->commit (its); }/* @@ -472,7 +472,8 @@ static int vgic_mmio_uaccess_write_its_iidr(struct kvm *kvm,if (rev >=NR_ITS_ABIS )return -EINVAL ; -return vgic_its_set_abi (its, rev); +vgic_its_set_abi (its, rev); +return 0 ; } static unsigned long vgic_mmio_read_its_idregs(struct kvm *kvm,@@ -1888,14 +1889,11 @@ static int vgic_its_create(struct kvm_device *dev, u32 type) its->baser_coll_table =INITIAL_BASER_VALUE | ((u64 )GITS_BASER_TYPE_COLLECTION <<GITS_BASER_TYPE_SHIFT ); dev->kvm->arch.vgic.propbaser =INITIAL_PROPBASER_VALUE ; - dev->private = its; - ret =vgic_its_set_abi (its,NR_ITS_ABIS -1 ); - +vgic_its_set_abi (its,NR_ITS_ABIS -1 );mutex_unlock (&dev->kvm->arch.config_lock); - -return ret; +return 0 ; }static void vgic_its_destroy (struct kvm_device *kvm_dev)@@ -2610,7 +2608,7 @@ static int vgic_its_restore_tables_v0(struct vgic_its *its)return ret; } -static int vgic_its_commit_v0 (struct vgic_its *its) +static void vgic_its_commit_v0 (struct vgic_its *its) {const struct vgic_its_abi *abi;@@ -2623,7 +2621,6 @@ static int vgic_its_commit_v0(struct vgic_its *its) its->baser_device_table |= (GIC_ENCODE_SZ (abi->dte_esz,5 ) <<GITS_BASER_ENTRY_SIZE_SHIFT ); -return 0 ; }static void vgic_its_reset (struct kvm *kvm,struct vgic_its *its)Signature · 1 line
2.54.0