Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbf6aa89 authored by Ian Campbell's avatar Ian Campbell Committed by Konrad Rzeszutek Wilk
Browse files

xen:events: move find_unbound_irq inside CONFIG_PCI_MSI 



The only caller is xen_allocate_pirq_msi which is also under this
ifdef so this fixes:
    drivers/xen/events.c:377: warning: 'find_unbound_pirq' defined but not used
when CONFIG_PCI_MSI=n

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
parent 3f2a230c

drivers/xen/events.c

+17 −17
Original line number Diff line number Diff line
@@ -387,23 +387,6 @@ static int get_nr_hw_irqs(void) 
	return ret;

}



static int find_unbound_pirq(int type)

{

	int rc, i;

	struct physdev_get_free_pirq op_get_free_pirq;

	op_get_free_pirq.type = type;



	rc = HYPERVISOR_physdev_op(PHYSDEVOP_get_free_pirq, &op_get_free_pirq);

	if (!rc)

		return op_get_free_pirq.pirq;



	for (i = 0; i < nr_irqs; i++) {

		if (pirq_to_irq[i] < 0)

			return i;

	}

	return -1;

}



static int find_unbound_irq(void)

{

	struct irq_data *data;
@@ -677,6 +660,23 @@ int xen_map_pirq_gsi(unsigned pirq, unsigned gsi, int shareable, char *name) 
#include <linux/msi.h>

#include "../pci/msi.h"



static int find_unbound_pirq(int type)

{

	int rc, i;

	struct physdev_get_free_pirq op_get_free_pirq;

	op_get_free_pirq.type = type;



	rc = HYPERVISOR_physdev_op(PHYSDEVOP_get_free_pirq, &op_get_free_pirq);

	if (!rc)

		return op_get_free_pirq.pirq;



	for (i = 0; i < nr_irqs; i++) {

		if (pirq_to_irq[i] < 0)

			return i;

	}

	return -1;

}



void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc)

{

	spin_lock(&irq_mapping_update_lock);