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

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
...@@ -27,16 +27,16 @@ static inline void __init xen_setup_pirqs(void) ...@@ -27,16 +27,16 @@ static inline void __init xen_setup_pirqs(void)
* its own functions. * its own functions.
*/ */
struct xen_pci_frontend_ops { 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); 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); void (*disable_msix)(struct pci_dev *dev);
}; };
extern struct xen_pci_frontend_ops *xen_pci_frontend; extern struct xen_pci_frontend_ops *xen_pci_frontend;
static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev, 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) if (xen_pci_frontend && xen_pci_frontend->enable_msi)
return xen_pci_frontend->enable_msi(dev, vectors); return xen_pci_frontend->enable_msi(dev, vectors);
...@@ -48,7 +48,7 @@ static inline void xen_pci_frontend_disable_msi(struct pci_dev *dev) ...@@ -48,7 +48,7 @@ static inline void xen_pci_frontend_disable_msi(struct pci_dev *dev)
xen_pci_frontend->disable_msi(dev); xen_pci_frontend->disable_msi(dev);
} }
static inline int xen_pci_frontend_enable_msix(struct pci_dev *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) if (xen_pci_frontend && xen_pci_frontend->enable_msix)
return xen_pci_frontend->enable_msix(dev, vectors, nvec); return xen_pci_frontend->enable_msix(dev, vectors, nvec);
......
...@@ -150,9 +150,9 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) ...@@ -150,9 +150,9 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
return -ENOMEM; return -ENOMEM;
if (type == PCI_CAP_ID_MSIX) 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 else
ret = xen_pci_frontend_enable_msi(dev, &v); ret = xen_pci_frontend_enable_msi(dev, v);
if (ret) if (ret)
goto error; goto error;
i = 0; i = 0;
......
...@@ -243,7 +243,7 @@ struct pci_ops pcifront_bus_ops = { ...@@ -243,7 +243,7 @@ struct pci_ops pcifront_bus_ops = {
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
static int pci_frontend_enable_msix(struct pci_dev *dev, static int pci_frontend_enable_msix(struct pci_dev *dev,
int **vector, int nvec) int vector[], int nvec)
{ {
int err; int err;
int i; int i;
...@@ -282,10 +282,10 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, ...@@ -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", dev_warn(&dev->dev, "MSI-X entry %d is invalid: %d!\n",
i, op.msix_entries[i].vector); i, op.msix_entries[i].vector);
err = -EINVAL; err = -EINVAL;
*(*vector+i) = -1; vector[i] = -1;
continue; continue;
} }
*(*vector+i) = op.msix_entries[i].vector; vector[i] = op.msix_entries[i].vector;
} }
} else { } else {
printk(KERN_DEBUG "enable msix get value %x\n", printk(KERN_DEBUG "enable msix get value %x\n",
...@@ -316,7 +316,7 @@ static void pci_frontend_disable_msix(struct pci_dev *dev) ...@@ -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); 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; int err;
struct xen_pci_op op = { struct xen_pci_op op = {
...@@ -330,12 +330,12 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector) ...@@ -330,12 +330,12 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector)
err = do_pci_op(pdev, &op); err = do_pci_op(pdev, &op);
if (likely(!err)) { if (likely(!err)) {
*(*vector) = op.value; vector[0] = op.value;
if (op.value <= 0) { if (op.value <= 0) {
dev_warn(&dev->dev, "MSI entry is invalid: %d!\n", dev_warn(&dev->dev, "MSI entry is invalid: %d!\n",
op.value); op.value);
err = -EINVAL; err = -EINVAL;
*(*vector) = -1; vector[0] = -1;
} }
} else { } else {
dev_err(&dev->dev, "pci frontend enable msi failed for dev " dev_err(&dev->dev, "pci frontend enable msi failed for dev "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment