diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-03-15 15:03:43 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 21:47:31 -0700 |
| commit | 793be9c76e7ca3841992e8bbdea46dcceb3e3118 (patch) | |
| tree | f04a9d33958565f7be96316e95c613d857a4cb52 /drivers/staging/hv/vmbus_drv.c | |
| parent | 086e7a5685babba533644acd1d39a81e3f8eed54 (diff) | |
Staging: hv: Get rid of the forward declaration for vmbus_isr
Get rid of the forward declaration of vmbus_isr by moving
the code around.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Mike Sterling <mike.sterling@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/vmbus_drv.c')
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 976175bc6c7b..194926cc80ff 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -48,7 +48,6 @@ struct hv_bus { }; -static irqreturn_t vmbus_isr(int irq, void *dev_id); static ssize_t vmbus_show_device_attr(struct device *dev, struct device_attribute *dev_attr, @@ -91,6 +90,7 @@ static struct device_attribute vmbus_device_attrs[] = { __ATTR_NULL }; + /* * vmbus_uevent - add uevent for our device * @@ -417,6 +417,28 @@ static int vmbus_on_isr(void) return ret; } + +static irqreturn_t vmbus_isr(int irq, void *dev_id) +{ + int ret; + + ret = vmbus_on_isr(); + + /* Schedules a dpc if necessary */ + if (ret > 0) { + if (test_bit(0, (unsigned long *)&ret)) + tasklet_schedule(&hv_bus.msg_dpc); + + if (test_bit(1, (unsigned long *)&ret)) + tasklet_schedule(&hv_bus.event_dpc); + + return IRQ_HANDLED; + } else { + return IRQ_NONE; + } +} + + static void get_channel_info(struct hv_device *device, struct hv_device_info *info) { @@ -836,29 +858,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj) } - -static irqreturn_t vmbus_isr(int irq, void *dev_id) -{ - int ret; - - ret = vmbus_on_isr(); - - /* Schedules a dpc if necessary */ - if (ret > 0) { - if (test_bit(0, (unsigned long *)&ret)) - tasklet_schedule(&hv_bus.msg_dpc); - - if (test_bit(1, (unsigned long *)&ret)) - tasklet_schedule(&hv_bus.event_dpc); - - return IRQ_HANDLED; - } else { - return IRQ_NONE; - } -} - - - static int __devinit hv_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { |