Commit 932c6dea authored by Deming Wang's avatar Deming Wang Committed by Michael Ellerman
Browse files

powerpc/xive: remove unused parameter 



The parameter xc to xive_cleanup_single_escalation() is unused, so we
can remove it.

Signed-off-by: default avatarDeming Wang <wangdeming@inspur.com>
[mpe: Reword change log, unwrap lines < 90 columns]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220413105507.1729-1-wangdeming@inspur.com
parent 4562bffb

arch/powerpc/kvm/book3s_xive.c

+2 −4
Original line number Diff line number Diff line
@@ -1785,8 +1785,7 @@ void kvmppc_xive_disable_vcpu_interrupts(struct kvm_vcpu *vcpu) 
 * stale_p (because it has no easy way to address it).  Hence we have

 * to adjust stale_p before shutting down the interrupt.

 */

void xive_cleanup_single_escalation(struct kvm_vcpu *vcpu,

				    struct kvmppc_xive_vcpu *xc, int irq)

void xive_cleanup_single_escalation(struct kvm_vcpu *vcpu, int irq)

{

	struct irq_data *d = irq_get_irq_data(irq);

	struct xive_irq_data *xd = irq_data_get_irq_handler_data(d);
@@ -1827,8 +1826,7 @@ void kvmppc_xive_cleanup_vcpu(struct kvm_vcpu *vcpu) 
	for (i = 0; i < KVMPPC_XIVE_Q_COUNT; i++) {

		if (xc->esc_virq[i]) {

			if (kvmppc_xive_has_single_escalation(xc->xive))

				xive_cleanup_single_escalation(vcpu, xc,

							xc->esc_virq[i]);

				xive_cleanup_single_escalation(vcpu, xc->esc_virq[i]);

			free_irq(xc->esc_virq[i], vcpu);

			irq_dispose_mapping(xc->esc_virq[i]);

			kfree(xc->esc_virq_names[i]);

arch/powerpc/kvm/book3s_xive.h

+1 −2
Original line number Diff line number Diff line
@@ -299,8 +299,7 @@ int kvmppc_xive_select_target(struct kvm *kvm, u32 *server, u8 prio); 
int kvmppc_xive_attach_escalation(struct kvm_vcpu *vcpu, u8 prio,

				  bool single_escalation);

struct kvmppc_xive *kvmppc_xive_get_device(struct kvm *kvm, u32 type);

void xive_cleanup_single_escalation(struct kvm_vcpu *vcpu,

				    struct kvmppc_xive_vcpu *xc, int irq);

void xive_cleanup_single_escalation(struct kvm_vcpu *vcpu, int irq);

int kvmppc_xive_compute_vp_id(struct kvmppc_xive *xive, u32 cpu, u32 *vp);

int kvmppc_xive_set_nr_servers(struct kvmppc_xive *xive, u64 addr);

bool kvmppc_xive_check_save_restore(struct kvm_vcpu *vcpu);

arch/powerpc/kvm/book3s_xive_native.c

+1 −2
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ void kvmppc_xive_native_cleanup_vcpu(struct kvm_vcpu *vcpu) 
		/* Free the escalation irq */

		if (xc->esc_virq[i]) {

			if (kvmppc_xive_has_single_escalation(xc->xive))

				xive_cleanup_single_escalation(vcpu, xc,

							xc->esc_virq[i]);

				xive_cleanup_single_escalation(vcpu, xc->esc_virq[i]);

			free_irq(xc->esc_virq[i], vcpu);

			irq_dispose_mapping(xc->esc_virq[i]);

			kfree(xc->esc_virq_names[i]);