From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932299Ab1DFV0W (ORCPT ); Wed, 6 Apr 2011 17:26:22 -0400 Received: from p3plsmtps2ded03.prod.phx3.secureserver.net ([208.109.80.60]:49971 "HELO p3plsmtps2ded03-01.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756898Ab1DFVYD (ORCPT ); Wed, 6 Apr 2011 17:24:03 -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 , Abhishek Kane , Hank Janssen Subject: [PATCH 20/22] Staging: hv: Move some definitions/declarations to be earlier in the file Date: Wed, 6 Apr 2011 14:35:18 -0700 Message-Id: <1302125720-10808-20-git-send-email-kys@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1302125720-10808-1-git-send-email-kys@microsoft.com> References: <1302125655-10741-1-git-send-email-kys@microsoft.com> <1302125720-10808-1-git-send-email-kys@microsoft.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move some definitions/declarations to be earlier in the file. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen --- drivers/staging/hv/blkvsc_drv.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 55ba9de..865b4dc 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -124,6 +124,14 @@ static const struct hv_guid g_blk_device_type = { */ static void blkvsc_request_completion(struct hv_storvsc_request *request); +static int blkvsc_ringbuffer_size = BLKVSC_RING_BUFFER_SIZE; + +/* + * There is a circular dependency involving blkvsc_probe() + * and block_ops. + */ +static int blkvsc_probe(struct device *dev); + static int blk_vsc_on_device_add(struct hv_device *device, void *additional_info) { @@ -1213,10 +1221,7 @@ static void blkvsc_request(struct request_queue *queue) } } -/* Static decl */ -static int blkvsc_probe(struct device *dev); -static int blkvsc_ringbuffer_size = BLKVSC_RING_BUFFER_SIZE; module_param(blkvsc_ringbuffer_size, int, S_IRUGO); MODULE_PARM_DESC(ring_size, "Ring buffer size (in bytes)"); -- 1.7.4.1