From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@suse.de, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, virtualization@lists.osdl.org
Cc: "K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Mike Sterling <mike.sterling@microsoft.com>,
Abhishek Kane <v-abkane@microsoft.com>,
Hank Janssen <hjanssen@microsoft.com>
Subject: [PATCH 11/12] Staging: hv: Get rid of the forward declaration for vmbus_isr
Date: Tue, 15 Mar 2011 15:03:43 -0700 [thread overview]
Message-ID: <1300226624-27004-12-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1300226624-27004-11-git-send-email-kys@microsoft.com>
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>
---
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 976175b..194926c 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)
{
--
1.5.5.6
next prev parent reply other threads:[~2011-03-15 21:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-15 22:02 [PATCH 00/12] Staging: hv: Cleanup vmbus driver - Phase II K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 01/12] Staging: hv: Make vmbus driver a pci driver K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 02/12] Staging: hv: Cleanup root device handling K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 03/12] Staging: hv: Cleanup irq management K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 04/12] Staging: hv: Rename vmbus_driver_context structure K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 05/12] Get rid of the forward declaration for vmbus_uevent K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 05/12] Staging: hv: " K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 06/12] Staging: hv: Get rid of the forward declaration for vmbus_match K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 07/12] Staging: hv: Get rid of the forward declaration for vmbus_probe K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 08/12] Staging: hv: Get rid of the forward declaration for vmbus_remove K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 09/12] Staging: hv: Get rid of the forward declaration for vmbus_shutdown K. Y. Srinivasan
2011-03-15 22:03 ` [PATCH 10/12] Staging: hv: Get rid of the forward declaration for vmbus_device_release K. Y. Srinivasan
2011-03-15 22:03 ` K. Y. Srinivasan [this message]
2011-03-15 22:03 ` [PATCH 12/12] Staging: hv: Get rid of the forward declaration for vmbus_show_device_attr K. Y. Srinivasan
2011-03-15 22:22 ` [PATCH 05/12] Staging: hv: Get rid of the forward declaration for vmbus_uevent Greg KH
2011-03-15 22:23 ` Greg KH
2011-03-15 22:39 ` KY Srinivasan
2011-03-15 22:51 ` Greg KH
2011-04-05 4:22 ` [PATCH 04/12] Staging: hv: Rename vmbus_driver_context structure Greg KH
2011-04-05 4:19 ` [PATCH 03/12] Staging: hv: Cleanup irq management Greg KH
2011-04-05 4:16 ` [PATCH 01/12] Staging: hv: Make vmbus driver a pci driver Greg KH
2011-03-15 22:04 ` [PATCH 00/12] Staging: hv: Cleanup vmbus driver - Phase II Greg KH
2011-03-15 22:24 ` KY Srinivasan
2011-03-15 22:30 ` Greg KH
2011-03-17 21:39 ` Valdis.Kletnieks
2011-03-17 21:45 ` Greg KH
2011-03-17 22:58 ` Valdis.Kletnieks
2011-04-16 0:34 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300226624-27004-12-git-send-email-kys@microsoft.com \
--to=kys@microsoft.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=haiyangz@microsoft.com \
--cc=hjanssen@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mike.sterling@microsoft.com \
--cc=v-abkane@microsoft.com \
--cc=virtualization@lists.osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome