From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758866Ab1COVy0 (ORCPT ); Tue, 15 Mar 2011 17:54:26 -0400 Received: from p3plsmtps2ded01.prod.phx3.secureserver.net ([208.109.80.58]:53218 "HELO p3plsmtps2ded01-02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1758793Ab1COVxt (ORCPT ); Tue, 15 Mar 2011 17:53:49 -0400 From: "K. Y. Srinivasan" To: gregkh@suse.de, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, virtualization@lists.osdl.org Cc: "K. Y. Srinivasan" , Haiyang Zhang , Mike Sterling , Abhishek Kane , Hank Janssen Subject: [PATCH 09/12] Staging: hv: Get rid of the forward declaration for vmbus_shutdown Date: Tue, 15 Mar 2011 15:03:41 -0700 Message-Id: <1300226624-27004-10-git-send-email-kys@microsoft.com> X-Mailer: git-send-email 1.5.5.6 In-Reply-To: <1300226624-27004-9-git-send-email-kys@microsoft.com> References: <1300226527-26933-1-git-send-email-kys@microsoft.com> <1300226624-27004-1-git-send-email-kys@microsoft.com> <1300226624-27004-2-git-send-email-kys@microsoft.com> <1300226624-27004-3-git-send-email-kys@microsoft.com> <1300226624-27004-4-git-send-email-kys@microsoft.com> <1300226624-27004-5-git-send-email-kys@microsoft.com> <1300226624-27004-6-git-send-email-kys@microsoft.com> <1300226624-27004-7-git-send-email-kys@microsoft.com> <1300226624-27004-8-git-send-email-kys@microsoft.com> <1300226624-27004-9-git-send-email-kys@microsoft.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Get rid of the forward declaration of vmbus_shutdown by moving the code around. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Mike Sterling Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen --- drivers/staging/hv/vmbus_drv.c | 44 ++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 3feed10..671632c 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -47,7 +47,6 @@ struct hv_bus { struct tasklet_struct event_dpc; }; -static void vmbus_shutdown(struct device *device); static irqreturn_t vmbus_isr(int irq, void *dev_id); @@ -276,6 +275,28 @@ static int vmbus_remove(struct device *child_device) return 0; } + +/* + * vmbus_shutdown - Shutdown a vmbus device + */ +static void vmbus_shutdown(struct device *child_device) +{ + struct hv_driver *drv; + + + /* The device may not be attached yet */ + if (!child_device->driver) + return; + + drv = drv_to_hv_drv(child_device->driver); + + /* Let the specific open-source driver handles the removal if it can */ + if (drv->driver.shutdown) + drv->driver.shutdown(child_device); + + return; +} + /* The one and only one */ static struct hv_bus hv_bus = { .bus.name = "vmbus", @@ -804,27 +825,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj) &device_obj->device); } -/* - * vmbus_shutdown - Shutdown a vmbus device - */ -static void vmbus_shutdown(struct device *child_device) -{ - struct hv_driver *drv; - - - /* The device may not be attached yet */ - if (!child_device->driver) - return; - - drv = drv_to_hv_drv(child_device->driver); - - /* Let the specific open-source driver handles the removal if it can */ - if (drv->driver.shutdown) - drv->driver.shutdown(child_device); - - return; -} - /* * vmbus_device_release - Final callback release of the vmbus child device -- 1.5.5.6