diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-02-17 12:02:23 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-02-18 12:41:49 -0500 |
commit | cc0f89c4a426fcd6400a89e9e34e4a8851abef76 (patch) | |
tree | 4d588c2cb0fdf6046e61f5be0b08d307b86a2dc8 | |
parent | 55cb8cd45e0600df1473489518d7f12ce1bbe973 (diff) |
pci/xen: Cleanup: convert int** to int[]
Cleanup code. Cosmetic change to make the code look easier
to read.
Reviewed-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r-- | arch/x86/include/asm/xen/pci.h | 8 | ||||
-rw-r--r-- | arch/x86/pci/xen.c | 4 | ||||
-rw-r--r-- | drivers/pci/xen-pcifront.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h index 2329b3eaf8d3..aa8620989162 100644 --- a/arch/x86/include/asm/xen/pci.h +++ b/arch/x86/include/asm/xen/pci.h | |||
@@ -27,16 +27,16 @@ static inline void __init xen_setup_pirqs(void) | |||
27 | * its own functions. | 27 | * its own functions. |
28 | */ | 28 | */ |
29 | struct xen_pci_frontend_ops { | 29 | struct xen_pci_frontend_ops { |
30 | int (*enable_msi)(struct pci_dev *dev, int **vectors); | 30 | int (*enable_msi)(struct pci_dev *dev, int vectors[]); |
31 | void (*disable_msi)(struct pci_dev *dev); | 31 | void (*disable_msi)(struct pci_dev *dev); |
32 | int (*enable_msix)(struct pci_dev *dev, int **vectors, int nvec); | 32 | int (*enable_msix)(struct pci_dev *dev, int vectors[], int nvec); |
33 | void (*disable_msix)(struct pci_dev *dev); | 33 | void (*disable_msix)(struct pci_dev *dev); |
34 | }; | 34 | }; |
35 | 35 | ||
36 | extern struct xen_pci_frontend_ops *xen_pci_frontend; | 36 | extern struct xen_pci_frontend_ops *xen_pci_frontend; |
37 | 37 | ||
38 | static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev, | 38 | static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev, |
39 | int **vectors) | 39 | int vectors[]) |
40 | { | 40 | { |
41 | if (xen_pci_frontend && xen_pci_frontend->enable_msi) | 41 | if (xen_pci_frontend && xen_pci_frontend->enable_msi) |
42 | return xen_pci_frontend->enable_msi(dev, vectors); | 42 | 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 | xen_pci_frontend->disable_msi(dev); | 48 | xen_pci_frontend->disable_msi(dev); |
49 | } | 49 | } |
50 | static inline int xen_pci_frontend_enable_msix(struct pci_dev *dev, | 50 | static inline int xen_pci_frontend_enable_msix(struct pci_dev *dev, |
51 | int **vectors, int nvec) | 51 | int vectors[], int nvec) |
52 | { | 52 | { |
53 | if (xen_pci_frontend && xen_pci_frontend->enable_msix) | 53 | if (xen_pci_frontend && xen_pci_frontend->enable_msix) |
54 | return xen_pci_frontend->enable_msix(dev, vectors, nvec); | 54 | return xen_pci_frontend->enable_msix(dev, vectors, nvec); |
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 6432f751ee4f..30fdd09dea05 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c | |||
@@ -150,9 +150,9 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | |||
150 | return -ENOMEM; | 150 | return -ENOMEM; |
151 | 151 | ||
152 | if (type == PCI_CAP_ID_MSIX) | 152 | if (type == PCI_CAP_ID_MSIX) |
153 | ret = xen_pci_frontend_enable_msix(dev, &v, nvec); | 153 | ret = xen_pci_frontend_enable_msix(dev, v, nvec); |
154 | else | 154 | else |
155 | ret = xen_pci_frontend_enable_msi(dev, &v); | 155 | ret = xen_pci_frontend_enable_msi(dev, v); |
156 | if (ret) | 156 | if (ret) |
157 | goto error; | 157 | goto error; |
158 | i = 0; | 158 | i = 0; |
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 5c7b6ad68056..492b7d807fe8 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c | |||
@@ -243,7 +243,7 @@ struct pci_ops pcifront_bus_ops = { | |||
243 | 243 | ||
244 | #ifdef CONFIG_PCI_MSI | 244 | #ifdef CONFIG_PCI_MSI |
245 | static int pci_frontend_enable_msix(struct pci_dev *dev, | 245 | static int pci_frontend_enable_msix(struct pci_dev *dev, |
246 | int **vector, int nvec) | 246 | int vector[], int nvec) |
247 | { | 247 | { |
248 | int err; | 248 | int err; |
249 | int i; | 249 | int i; |
@@ -282,10 +282,10 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, | |||
282 | dev_warn(&dev->dev, "MSI-X entry %d is invalid: %d!\n", | 282 | dev_warn(&dev->dev, "MSI-X entry %d is invalid: %d!\n", |
283 | i, op.msix_entries[i].vector); | 283 | i, op.msix_entries[i].vector); |
284 | err = -EINVAL; | 284 | err = -EINVAL; |
285 | *(*vector+i) = -1; | 285 | vector[i] = -1; |
286 | continue; | 286 | continue; |
287 | } | 287 | } |
288 | *(*vector+i) = op.msix_entries[i].vector; | 288 | vector[i] = op.msix_entries[i].vector; |
289 | } | 289 | } |
290 | } else { | 290 | } else { |
291 | printk(KERN_DEBUG "enable msix get value %x\n", | 291 | printk(KERN_DEBUG "enable msix get value %x\n", |
@@ -316,7 +316,7 @@ static void pci_frontend_disable_msix(struct pci_dev *dev) | |||
316 | dev_err(&dev->dev, "pci_disable_msix get err %x\n", err); | 316 | dev_err(&dev->dev, "pci_disable_msix get err %x\n", err); |
317 | } | 317 | } |
318 | 318 | ||
319 | static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector) | 319 | static int pci_frontend_enable_msi(struct pci_dev *dev, int vector[]) |
320 | { | 320 | { |
321 | int err; | 321 | int err; |
322 | struct xen_pci_op op = { | 322 | struct xen_pci_op op = { |
@@ -330,12 +330,12 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector) | |||
330 | 330 | ||
331 | err = do_pci_op(pdev, &op); | 331 | err = do_pci_op(pdev, &op); |
332 | if (likely(!err)) { | 332 | if (likely(!err)) { |
333 | *(*vector) = op.value; | 333 | vector[0] = op.value; |
334 | if (op.value <= 0) { | 334 | if (op.value <= 0) { |
335 | dev_warn(&dev->dev, "MSI entry is invalid: %d!\n", | 335 | dev_warn(&dev->dev, "MSI entry is invalid: %d!\n", |
336 | op.value); | 336 | op.value); |
337 | err = -EINVAL; | 337 | err = -EINVAL; |
338 | *(*vector) = -1; | 338 | vector[0] = -1; |
339 | } | 339 | } |
340 | } else { | 340 | } else { |
341 | dev_err(&dev->dev, "pci frontend enable msi failed for dev " | 341 | dev_err(&dev->dev, "pci frontend enable msi failed for dev " |