From patchwork Mon May 13 09:19:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 18391 X-Patchwork-Delegate: g.liakhovetski@gmx.de Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Ubp9e-0000zL-1S; Mon, 13 May 2013 11:34:50 +0200 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-7) with esmtp id 1Ubp9b-0000l6-21; Mon, 13 May 2013 11:34:49 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752791Ab3EMJcl (ORCPT + 1 other); Mon, 13 May 2013 05:32:41 -0400 Received: from mail-da0-f49.google.com ([209.85.210.49]:37279 "EHLO mail-da0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750992Ab3EMJck (ORCPT ); Mon, 13 May 2013 05:32:40 -0400 Received: by mail-da0-f49.google.com with SMTP id p5so764717dak.8 for ; Mon, 13 May 2013 02:32:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=W2NzJP1mYoDUpVQ8AC6fov9h3gLkokePQGsxUIffePc=; b=n1yVdU6EhC1Bh80yv/hkPPE7HcoiZuq9gTt94JMjL/NP7W1Cy7UI4wAWhLbAUueNlP iy2Vddv7X+DRLapYbdccOhIy5ulpn+uL6DG3BFryomuYjXsWu3FLR3paamDB+jPOK3OF P6PyF7oLUjl9fE7q1LHCtg5HiX0h3dw+AUTWREvkg6IjyixXpx0b2Re9daq9r+C4PZDS PXsC2n8OJZ06yEpVip23vDL9TM+6FHmiIIf7aqGmz+AXLLr2OcMt+IVriUx/fEky+MNU D4UI4ugXUnfM/6r99IKLzGxQDhvL2UsyuNwgUtSZQc73pTPHbf6E8kBEkYYNRYsJrxdx DlKw== X-Received: by 10.68.201.39 with SMTP id jx7mr6107715pbc.186.1368437560260; Mon, 13 May 2013 02:32:40 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id az5sm13367614pbc.18.2013.05.13.02.32.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 May 2013 02:32:39 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, sachin.kamat@linaro.org Subject: [PATCH 1/2] [media] soc_camera/sh_mobile_csi2: Remove redundant platform_set_drvdata() Date: Mon, 13 May 2013 14:49:20 +0530 Message-Id: <1368436761-12183-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQn3yBkk5g0khSqAhQQHWgBeR97LYUFMQ/BUliKFOsVw3cKP3mmkjif68yum3DCu3MrBIamx 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: 2013.5.13.92725 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1400_1499 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 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, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat --- drivers/media/platform/soc_camera/sh_mobile_csi2.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c index 09cb4fc..13a1f8f 100644 --- a/drivers/media/platform/soc_camera/sh_mobile_csi2.c +++ b/drivers/media/platform/soc_camera/sh_mobile_csi2.c @@ -340,18 +340,13 @@ static int sh_csi2_probe(struct platform_device *pdev) ret = v4l2_device_register_subdev(pdata->v4l2_dev, &priv->subdev); dev_dbg(&pdev->dev, "%s(%p): ret(register_subdev) = %d\n", __func__, priv, ret); if (ret < 0) - goto esdreg; + return ret; pm_runtime_enable(&pdev->dev); dev_dbg(&pdev->dev, "CSI2 probed.\n"); return 0; - -esdreg: - platform_set_drvdata(pdev, NULL); - - return ret; } static int sh_csi2_remove(struct platform_device *pdev) @@ -360,7 +355,6 @@ static int sh_csi2_remove(struct platform_device *pdev) v4l2_device_unregister_subdev(&priv->subdev); pm_runtime_disable(&pdev->dev); - platform_set_drvdata(pdev, NULL); return 0; }