| Message ID | 1565862982-9787-1-git-send-email-alexandru.elisei@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: arm/arm64: vgic: Make function comments match function declarations | expand |
On Thu, 15 Aug 2019 10:56:22 +0100 Alexandru Elisei <alexandru.elisei@arm.com> wrote: > Since commit 503a62862e8f ("KVM: arm/arm64: vgic: Rely on the GIC driver to > parse the firmware tables"), the vgic_v{2,3}_probe functions stopped using > a DT node. Commit 909777324588 ("KVM: arm/arm64: vgic-new: vgic_init: > implement kvm_vgic_hyp_init") changed the functions again, and now they > require exactly one argument, a struct gic_kvm_info populated by the GIC > driver. Unfortunately the comments regressed and state that a DT node is > used instead. Change the function comments to reflect the current > prototypes. > > Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> > --- > virt/kvm/arm/vgic/vgic-v2.c | 7 ++++--- > virt/kvm/arm/vgic/vgic-v3.c | 7 ++++--- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c > index 96aab77d0471..27b1ddf71aa0 100644 > --- a/virt/kvm/arm/vgic/vgic-v2.c > +++ b/virt/kvm/arm/vgic/vgic-v2.c > @@ -354,10 +354,11 @@ int vgic_v2_map_resources(struct kvm *kvm) > DEFINE_STATIC_KEY_FALSE(vgic_v2_cpuif_trap); > > /** > - * vgic_v2_probe - probe for a GICv2 compatible interrupt controller in DT > - * @node: pointer to the DT node > + * vgic_v2_probe - probe for a VGICv2 compatible interrupt controller > + * @info: pointer to the GIC description > * > - * Returns 0 if a GICv2 has been found, returns an error code otherwise > + * Returns 0 if the VGICv2 has been probed successfully, returns an error code > + * otherwise > */ > int vgic_v2_probe(const struct gic_kvm_info *info) > { > diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c > index 0c653a1e5215..4874f3266bea 100644 > --- a/virt/kvm/arm/vgic/vgic-v3.c > +++ b/virt/kvm/arm/vgic/vgic-v3.c > @@ -570,10 +570,11 @@ static int __init early_gicv4_enable(char *buf) > early_param("kvm-arm.vgic_v4_enable", early_gicv4_enable); > > /** > - * vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT > - * @node: pointer to the DT node > + * vgic_v3_probe - probe for a VGICv3 compatible interrupt controller > + * @info: pointer to the GIC description > * > - * Returns 0 if a GICv3 has been found, returns an error code otherwise > + * Returns 0 if the VGICv3 has been probed successfully, returns an error code > + * otherwise > */ > int vgic_v3_probe(const struct gic_kvm_info *info) > { Queued, thanks. M.
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c index 96aab77d0471..27b1ddf71aa0 100644 --- a/virt/kvm/arm/vgic/vgic-v2.c +++ b/virt/kvm/arm/vgic/vgic-v2.c @@ -354,10 +354,11 @@ int vgic_v2_map_resources(struct kvm *kvm) DEFINE_STATIC_KEY_FALSE(vgic_v2_cpuif_trap); /** - * vgic_v2_probe - probe for a GICv2 compatible interrupt controller in DT - * @node: pointer to the DT node + * vgic_v2_probe - probe for a VGICv2 compatible interrupt controller + * @info: pointer to the GIC description * - * Returns 0 if a GICv2 has been found, returns an error code otherwise + * Returns 0 if the VGICv2 has been probed successfully, returns an error code + * otherwise */ int vgic_v2_probe(const struct gic_kvm_info *info) { diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c index 0c653a1e5215..4874f3266bea 100644 --- a/virt/kvm/arm/vgic/vgic-v3.c +++ b/virt/kvm/arm/vgic/vgic-v3.c @@ -570,10 +570,11 @@ static int __init early_gicv4_enable(char *buf) early_param("kvm-arm.vgic_v4_enable", early_gicv4_enable); /** - * vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT - * @node: pointer to the DT node + * vgic_v3_probe - probe for a VGICv3 compatible interrupt controller + * @info: pointer to the GIC description * - * Returns 0 if a GICv3 has been found, returns an error code otherwise + * Returns 0 if the VGICv3 has been probed successfully, returns an error code + * otherwise */ int vgic_v3_probe(const struct gic_kvm_info *info) {
Since commit 503a62862e8f ("KVM: arm/arm64: vgic: Rely on the GIC driver to parse the firmware tables"), the vgic_v{2,3}_probe functions stopped using a DT node. Commit 909777324588 ("KVM: arm/arm64: vgic-new: vgic_init: implement kvm_vgic_hyp_init") changed the functions again, and now they require exactly one argument, a struct gic_kvm_info populated by the GIC driver. Unfortunately the comments regressed and state that a DT node is used instead. Change the function comments to reflect the current prototypes. Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> --- virt/kvm/arm/vgic/vgic-v2.c | 7 ++++--- virt/kvm/arm/vgic/vgic-v3.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-)