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

Commit cc0f89c4 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

pci/xen: Cleanup: convert int** to int[] 



Cleanup code. Cosmetic change to make the code look easier
to read.

Reviewed-by: default avatarIan Campbell <Ian.Campbell@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 55cb8cd4

arch/x86/include/asm/xen/pci.h

+4 −4
Original line number Diff line number Diff line
@@ -27,16 +27,16 @@ static inline void __init xen_setup_pirqs(void) 
 * its own functions.

 */

struct xen_pci_frontend_ops {

	int (*enable_msi)(struct pci_dev *dev, int **vectors);

	int (*enable_msi)(struct pci_dev *dev, int vectors[]);

	void (*disable_msi)(struct pci_dev *dev);

	int (*enable_msix)(struct pci_dev *dev, int **vectors, int nvec);

	int (*enable_msix)(struct pci_dev *dev, int vectors[], int nvec);

	void (*disable_msix)(struct pci_dev *dev);

};



extern struct xen_pci_frontend_ops *xen_pci_frontend;



static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev,

					      int **vectors)

					      int vectors[])

{

	if (xen_pci_frontend && xen_pci_frontend->enable_msi)

		return xen_pci_frontend->enable_msi(dev, vectors);
@@ -48,7 +48,7 @@ static inline void xen_pci_frontend_disable_msi(struct pci_dev *dev) 
			xen_pci_frontend->disable_msi(dev);

}

static inline int xen_pci_frontend_enable_msix(struct pci_dev *dev,

					       int **vectors, int nvec)

					       int vectors[], int nvec)

{

	if (xen_pci_frontend && xen_pci_frontend->enable_msix)

		return xen_pci_frontend->enable_msix(dev, vectors, nvec);

arch/x86/pci/xen.c

+2 −2
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
		return -ENOMEM;



	if (type == PCI_CAP_ID_MSIX)

		ret = xen_pci_frontend_enable_msix(dev, &v, nvec);

		ret = xen_pci_frontend_enable_msix(dev, v, nvec);

	else

		ret = xen_pci_frontend_enable_msi(dev, &v);

		ret = xen_pci_frontend_enable_msi(dev, v);

	if (ret)

		goto error;

	i = 0;

drivers/pci/xen-pcifront.c

+6 −6
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ struct pci_ops pcifront_bus_ops = { 


#ifdef CONFIG_PCI_MSI

static int pci_frontend_enable_msix(struct pci_dev *dev,

				    int **vector, int nvec)

				    int vector[], int nvec)

{

	int err;

	int i;
@@ -282,10 +282,10 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, 
					dev_warn(&dev->dev, "MSI-X entry %d is invalid: %d!\n",

						i, op.msix_entries[i].vector);

					err = -EINVAL;

					*(*vector+i) = -1;

					vector[i] = -1;

					continue;

				}

				*(*vector+i) = op.msix_entries[i].vector;

				vector[i] = op.msix_entries[i].vector;

			}

		} else {

			printk(KERN_DEBUG "enable msix get value %x\n",
@@ -316,7 +316,7 @@ static void pci_frontend_disable_msix(struct pci_dev *dev) 
		dev_err(&dev->dev, "pci_disable_msix get err %x\n", err);

}



static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector)

static int pci_frontend_enable_msi(struct pci_dev *dev, int vector[])

{

	int err;

	struct xen_pci_op op = {
@@ -330,12 +330,12 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector) 


	err = do_pci_op(pdev, &op);

	if (likely(!err)) {

		*(*vector) = op.value;

		vector[0] = op.value;

		if (op.value <= 0) {

			dev_warn(&dev->dev, "MSI entry is invalid: %d!\n",

				op.value);

			err = -EINVAL;

			*(*vector) = -1;	

			vector[0] = -1;

		}

	} else {

		dev_err(&dev->dev, "pci frontend enable msi failed for dev "