From patchwork Mon Mar 2 14:54:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 28456 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YSRk9-0003jk-6V; Mon, 02 Mar 2015 15:54:49 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1YSRk7-0004Ne-3S; Mon, 02 Mar 2015 15:54:48 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754287AbbCBOyj (ORCPT + 1 other); Mon, 2 Mar 2015 09:54:39 -0500 Received: from mail-we0-f174.google.com ([74.125.82.174]:40007 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753759AbbCBOyg (ORCPT ); Mon, 2 Mar 2015 09:54:36 -0500 Received: by wesx3 with SMTP id x3so33807797wes.7 for ; Mon, 02 Mar 2015 06:54:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=zQ3tC5P7CCjSS1fTLqckoZ9Z0q5QgYPxHuZb+E/AkQg=; b=y1tRpvxUuaq23XQyNrPqAAeMCqqNJJmjrHfGhNCtZnoQotv5TXVmNqccDFt+gMplyy vqUp4HVBU0HmVYhYlDHsIeKZOCV+0ayiymmi2/rNjY/7QnSMNmWc5t5R6O4RlJL4b77H wZ/7ghtthzRe4Br+sbOF9GEy332kw9bPAPsTa6/vnbx4JrwFIpWoX1EhNUdbjxjdV/vv XGarZpwupo46+RoB4HKcc4kjbgRo/CfXZWSnrJ58hWccMkP3X5IDnq0j5+H3s8q2NlD0 6MyXfhMB3G4Oxv3+IXKE27TVAghsyYPZrNGfvbyUx+pEPysMPqMoSvrzADlnF9q5Rp8i ms3g== X-Received: by 10.180.101.168 with SMTP id fh8mr22022085wib.74.1425308074550; Mon, 02 Mar 2015 06:54:34 -0800 (PST) Received: from tango-charlie.RL.local ([194.72.83.162]) by mx.google.com with ESMTPSA id s5sm16996384wia.1.2015.03.02.06.54.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Mar 2015 06:54:33 -0800 (PST) From: Lad Prabhakar To: linux-media@vger.kernel.org Cc: Laurent Pinchart , Hans Verkuil , Guennadi Liakhovetski , Sylwester Nawrocki , "Lad, Prabhakar" Subject: [PATCH] media: drop call to v4l2_device_unregister_subdev() Date: Mon, 2 Mar 2015 14:54:07 +0000 Message-Id: <1425308047-24756-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.3.2.144818 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: "Lad, Prabhakar" These drivers are moved to support asynchronous probing, v4l2_async_unregister_subdev() unregisters the subdev so there isn't a need to explicitly call v4l2_device_unregister_subdev(). Signed-off-by: Lad, Prabhakar --- drivers/media/i2c/adv7343.c | 1 - drivers/media/i2c/adv7604.c | 1 - drivers/media/i2c/mt9v032.c | 1 - drivers/media/i2c/soc_camera/mt9m111.c | 1 - drivers/media/i2c/ths8200.c | 1 - drivers/media/i2c/tvp514x.c | 1 - drivers/media/i2c/tvp7002.c | 1 - drivers/media/platform/soc_camera/sh_mobile_csi2.c | 1 - 8 files changed, 8 deletions(-) diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c index 9d38f7b..7c50833 100644 --- a/drivers/media/i2c/adv7343.c +++ b/drivers/media/i2c/adv7343.c @@ -506,7 +506,6 @@ static int adv7343_remove(struct i2c_client *client) struct adv7343_state *state = to_state(sd); v4l2_async_unregister_subdev(&state->sd); - v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(&state->hdl); return 0; diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index d228b7c..af6363d 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -2879,7 +2879,6 @@ static int adv7604_remove(struct i2c_client *client) cancel_delayed_work(&state->delayed_work_enable_hotplug); destroy_workqueue(state->work_queues); v4l2_async_unregister_subdev(sd); - v4l2_device_unregister_subdev(sd); media_entity_cleanup(&sd->entity); adv7604_unregister_clients(to_state(sd)); v4l2_ctrl_handler_free(sd->ctrl_handler); diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c index bd3f979..3267c18 100644 --- a/drivers/media/i2c/mt9v032.c +++ b/drivers/media/i2c/mt9v032.c @@ -1016,7 +1016,6 @@ static int mt9v032_remove(struct i2c_client *client) v4l2_async_unregister_subdev(subdev); v4l2_ctrl_handler_free(&mt9v032->ctrls); - v4l2_device_unregister_subdev(subdev); media_entity_cleanup(&subdev->entity); return 0; diff --git a/drivers/media/i2c/soc_camera/mt9m111.c b/drivers/media/i2c/soc_camera/mt9m111.c index 5992ea9..441e0fd 100644 --- a/drivers/media/i2c/soc_camera/mt9m111.c +++ b/drivers/media/i2c/soc_camera/mt9m111.c @@ -1016,7 +1016,6 @@ static int mt9m111_remove(struct i2c_client *client) v4l2_async_unregister_subdev(&mt9m111->subdev); v4l2_clk_put(mt9m111->clk); - v4l2_device_unregister_subdev(&mt9m111->subdev); v4l2_ctrl_handler_free(&mt9m111->hdl); return 0; diff --git a/drivers/media/i2c/ths8200.c b/drivers/media/i2c/ths8200.c index 4ebd329..73fc42b 100644 --- a/drivers/media/i2c/ths8200.c +++ b/drivers/media/i2c/ths8200.c @@ -479,7 +479,6 @@ static int ths8200_remove(struct i2c_client *client) ths8200_s_power(sd, false); v4l2_async_unregister_subdev(&decoder->sd); - v4l2_device_unregister_subdev(sd); return 0; } diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c index 2042042..c6b3dc5 100644 --- a/drivers/media/i2c/tvp514x.c +++ b/drivers/media/i2c/tvp514x.c @@ -1209,7 +1209,6 @@ static int tvp514x_remove(struct i2c_client *client) struct tvp514x_decoder *decoder = to_decoder(sd); v4l2_async_unregister_subdev(&decoder->sd); - v4l2_device_unregister_subdev(sd); #if defined(CONFIG_MEDIA_CONTROLLER) media_entity_cleanup(&decoder->sd.entity); #endif diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c index fe4870e..9233194 100644 --- a/drivers/media/i2c/tvp7002.c +++ b/drivers/media/i2c/tvp7002.c @@ -1116,7 +1116,6 @@ static int tvp7002_remove(struct i2c_client *c) #if defined(CONFIG_MEDIA_CONTROLLER) media_entity_cleanup(&device->sd.entity); #endif - v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(&device->hdl); return 0; } diff --git a/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c index c4e7aa0..cd93241 100644 --- a/drivers/media/platform/soc_camera/sh_mobile_csi2.c +++ b/drivers/media/platform/soc_camera/sh_mobile_csi2.c @@ -380,7 +380,6 @@ static int sh_csi2_remove(struct platform_device *pdev) struct sh_csi2 *priv = container_of(subdev, struct sh_csi2, subdev); v4l2_async_unregister_subdev(&priv->subdev); - v4l2_device_unregister_subdev(subdev); pm_runtime_disable(&pdev->dev); return 0;