evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: hv: vmbus: Change the signature of vmbus_bus_init()

Browse source 
In preparation for making the vmbus driver an ACPI bus driver, change the
signature of vmbus_bus_init() to accept the irq value.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-06-06 15:49:37 -07:00 • committed by Greg Kroah-Hartman
parent 3e1edf6a6c
commit 9aaa995e6a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/staging/hv/vmbus_drv.c
View file

@ -528,7 +528,7 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
* - get the irq resource * - get the irq resource
* - retrieve the channel offers * - retrieve the channel offers
*/ */
static int vmbus_bus_init(struct pci_dev *pdev) static int vmbus_bus_init(int irq)
{ {
int ret; int ret;
unsigned int vector; unsigned int vector;
@ -552,13 +552,13 @@ static int vmbus_bus_init(struct pci_dev *pdev)
} }
/* Get the interrupt resource */ /* Get the interrupt resource */
ret = request_irq(pdev->irq, vmbus_isr, ret = request_irq(irq, vmbus_isr,
IRQF_SHARED | IRQF_SAMPLE_RANDOM, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
driver_name, pdev); driver_name, hv_pci_dev);
if (ret != 0) { if (ret != 0) {
pr_err("Unable to request IRQ %d\n", pr_err("Unable to request IRQ %d\n",
pdev->irq); irq);
bus_unregister(&hv_bus); bus_unregister(&hv_bus);
@ -566,7 +566,7 @@ static int vmbus_bus_init(struct pci_dev *pdev)
goto cleanup; goto cleanup;
} }
vector = IRQ0_VECTOR + pdev->irq; vector = IRQ0_VECTOR + irq;
/* /*
* Notify the hypervisor of our irq and * Notify the hypervisor of our irq and
@ -575,7 +575,7 @@ static int vmbus_bus_init(struct pci_dev *pdev)
on_each_cpu(hv_synic_init, (void *)&vector, 1); on_each_cpu(hv_synic_init, (void *)&vector, 1);
ret = vmbus_connect(); ret = vmbus_connect();
if (ret) { if (ret) {
free_irq(pdev->irq, pdev); free_irq(irq, hv_pci_dev);
bus_unregister(&hv_bus); bus_unregister(&hv_bus);
goto cleanup; goto cleanup;
} }
@ -795,7 +795,7 @@ static int __devinit hv_pci_probe(struct pci_dev *pdev,
if (pdev->irq == 0) if (pdev->irq == 0)
pdev->irq = irq; pdev->irq = irq;
pci_probe_error = vmbus_bus_init(pdev); pci_probe_error = vmbus_bus_init(pdev->irq);
if (pci_probe_error) if (pci_probe_error)
pci_disable_device(pdev); pci_disable_device(pdev);