Skip to content

Commit

Permalink
Staging: hv: vmbus: Change the signature of vmbus_bus_init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent 3e1edf6 commit 9aaa995
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
* - get the irq resource
* - retrieve the channel offers
*/
static int vmbus_bus_init(struct pci_dev *pdev)
static int vmbus_bus_init(int irq)
{
int ret;
unsigned int vector;
Expand All @@ -552,21 +552,21 @@ static int vmbus_bus_init(struct pci_dev *pdev)
}

/* Get the interrupt resource */
ret = request_irq(pdev->irq, vmbus_isr,
ret = request_irq(irq, vmbus_isr,
IRQF_SHARED | IRQF_SAMPLE_RANDOM,
driver_name, pdev);
driver_name, hv_pci_dev);

if (ret != 0) {
pr_err("Unable to request IRQ %d\n",
pdev->irq);
irq);

bus_unregister(&hv_bus);

ret = -1;
goto cleanup;
}

vector = IRQ0_VECTOR + pdev->irq;
vector = IRQ0_VECTOR + irq;

/*
* Notify the hypervisor of our irq and
Expand All @@ -575,7 +575,7 @@ static int vmbus_bus_init(struct pci_dev *pdev)
on_each_cpu(hv_synic_init, (void *)&vector, 1);
ret = vmbus_connect();
if (ret) {
free_irq(pdev->irq, pdev);
free_irq(irq, hv_pci_dev);
bus_unregister(&hv_bus);
goto cleanup;
}
Expand Down Expand Up @@ -795,7 +795,7 @@ static int __devinit hv_pci_probe(struct pci_dev *pdev,
if (pdev->irq == 0)
pdev->irq = irq;

pci_probe_error = vmbus_bus_init(pdev);
pci_probe_error = vmbus_bus_init(pdev->irq);

if (pci_probe_error)
pci_disable_device(pdev);
Expand Down

0 comments on commit 9aaa995

Please sign in to comment.