From patchwork Fri Sep 20 08:36:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 20145 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 1VMwCO-00083H-Ju; Fri, 20 Sep 2013 10:36:24 +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-6) with esmtp id 1VMwCM-0007iN-5U; Fri, 20 Sep 2013 10:36:24 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754333Ab3ITIgU (ORCPT + 1 other); Fri, 20 Sep 2013 04:36:20 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35627 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754252Ab3ITIgU (ORCPT ); Fri, 20 Sep 2013 04:36:20 -0400 Received: by mail-pa0-f50.google.com with SMTP id fb10so446115pad.23 for ; Fri, 20 Sep 2013 01:36:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RCrt1UrxpwFgEct97i0QLydzEZWHH7mOB8a1TsbRQs8=; b=k6YmMUav9oKM96GMqtk3fRjHOvFvMUknTlKaeSFu+PeQ6m761J4YtHtk9z4OgvxQpL kpp7coIdcIR0slKyXtsmE7JmBI4ewjYBRPcJxMWJysSwEMZzMvM9L5OyCtKJlOWPWRHq TO9Uy+UEWVGrL5HJQsN3jy3iXK7D/AiIiRvWIqp/Nsr9YshFmoUZ0TJBKZByjeZDATaT mJrIupduYI/cIdMqGvpHtIsAH3ne/jx3FE8WTchE60PtzUfLu/aAD0md9Js2IphcIdyF qT+OMSF2VXBDCr64UkupfzodMNRl39x5HlFTOxKBfHxC5x7skCN6vJJC/5Wd1UQHk7sT ReXg== X-Gm-Message-State: ALoCoQnfUR/8RAsb4TksdzbwDtvRTtgppIkJ0gbvv9f0om4gzIG2TNV0TbW2zDT/8fAEXt17OaOc X-Received: by 10.66.27.175 with SMTP id u15mr7373707pag.146.1379666179514; Fri, 20 Sep 2013 01:36:19 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id mr3sm14271180pbb.27.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Sep 2013 01:36:19 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, sachin.kamat@linaro.org, Andreas Oberritter Subject: [PATCH 5/9] [media] pci: pluto2: Remove redundant pci_set_drvdata Date: Fri, 20 Sep 2013 14:06:17 +0530 Message-Id: <1379666181-19546-5-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1379666181-19546-1-git-send-email-sachin.kamat@linaro.org> References: <1379666181-19546-1-git-send-email-sachin.kamat@linaro.org> 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.9.20.82715 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_1000_1099 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, __IN_REP_TO 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' Driver core sets driver data to NULL upon failure or remove. Signed-off-by: Sachin Kamat Cc: Andreas Oberritter --- drivers/media/pci/pluto2/pluto2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c index 4938285..8164d74 100644 --- a/drivers/media/pci/pluto2/pluto2.c +++ b/drivers/media/pci/pluto2/pluto2.c @@ -736,7 +736,6 @@ err_pci_release_regions: err_pci_disable_device: pci_disable_device(pdev); err_kfree: - pci_set_drvdata(pdev, NULL); kfree(pluto); goto out; } @@ -765,7 +764,6 @@ static void pluto2_remove(struct pci_dev *pdev) pci_iounmap(pdev, pluto->io_mem); pci_release_regions(pdev); pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); kfree(pluto); }