Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755347Ab1EIVzY (ORCPT ); Mon, 9 May 2011 17:55:24 -0400 Received: from p3plsmtps2ded01.prod.phx3.secureserver.net ([208.109.80.58]:47584 "HELO p3plsmtps2ded01-01.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755020Ab1EIVov (ORCPT ); Mon, 9 May 2011 17:44:51 -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 081/206] Staging: hv: Get rid of the indirection to invoke mousevsc_on_device_remove Date: Mon, 9 May 2011 14:56:03 -0700 Message-Id: <1304978288-22999-81-git-send-email-kys@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com> References: <1304978242-22958-1-git-send-email-kys@microsoft.com> <1304978288-22999-1-git-send-email-kys@microsoft.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1459 Lines: 48 The subject line says it all. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen --- drivers/staging/hv/hv_mouse.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index 43f5158..b7016e2 100644 --- a/drivers/staging/hv/hv_mouse.c +++ b/drivers/staging/hv/hv_mouse.c @@ -859,9 +859,6 @@ static int mousevsc_remove(struct hv_device *dev) { int ret = 0; - struct mousevsc_drv_obj *mousevsc_drv_obj = - drv_to_mousedrv(dev->device.driver); - struct input_device_context *input_dev_ctx; input_dev_ctx = kmalloc(sizeof(struct input_device_context), @@ -874,14 +871,11 @@ static int mousevsc_remove(struct hv_device *dev) input_dev_ctx->connected = 0; } - if (!mousevsc_drv_obj->base.dev_rm) - return -1; - /* * Call to the vsc driver to let it know that the device * is being removed */ - ret = mousevsc_drv_obj->base.dev_rm(dev); + ret = mousevsc_on_device_remove(dev); if (ret != 0) { DPRINT_ERR(INPUTVSC_DRV, -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/