From patchwork Fri Sep 20 08:36:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 20142 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 1VMwCH-00082i-RP; Fri, 20 Sep 2013 10:36:17 +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 1VMwCF-0002ME-2s; Fri, 20 Sep 2013 10:36:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754322Ab3ITIgO (ORCPT + 1 other); Fri, 20 Sep 2013 04:36:14 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:44553 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754317Ab3ITIgN (ORCPT ); Fri, 20 Sep 2013 04:36:13 -0400 Received: by mail-pd0-f170.google.com with SMTP id x10so129215pdj.1 for ; Fri, 20 Sep 2013 01:36:13 -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=Lksj352f/EVpb3XCKDDGqs0s4DzrA/Xat2NAhO3GJ/s=; b=Rq4ffY/fZN6Mi56bWq2abE05E5f5dabJDE3T2qTLbxhZ92OBhQCD99MnwPdXTE8hK4 e6hLvuB5g5+A61WNC2R7iBTy7ZLoA8yAVLWK54R9xQMtCX33Ih/OBRlO+Xbf/Nh22dgt HWJPQu+bHRoBJReikmfVNBv1d5KGaLv0b0KsE2MEFXo9hnjyFgtCIBBP1zFsvwKjNAFK e3HHLfbHAUyDGUVJbTax4qgc/oChPzK6P8b3Hwif/zo1Bj3u42MTwHMfA7SddOFbDsYj wdaSVkcCBSdNLMZ7LyTjzpUnX71xTNt1QfkN2VW7lC/3wyN8aOTkDh5TuiUHxVPtofd4 8JgA== X-Gm-Message-State: ALoCoQk7SUq+V4VoAokz9+GKeFRIbsbA7KCgDOpQhgpYXA+lesaAjixMce/jM6JGlE7z+NsUyI61 X-Received: by 10.69.12.36 with SMTP id en4mr6686479pbd.54.1379666172950; Fri, 20 Sep 2013 01:36:12 -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:12 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, sachin.kamat@linaro.org Subject: [PATCH 2/9] [media] pci: cx88: Remove redundant pci_set_drvdata Date: Fri, 20 Sep 2013 14:06:14 +0530 Message-Id: <1379666181-19546-2-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_1700_1799 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, ECARD_WORD 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 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 --- drivers/media/pci/cx88/cx88-alsa.c | 2 -- drivers/media/pci/cx88/cx88-mpeg.c | 1 - drivers/media/pci/cx88/cx88-video.c | 1 - 3 files changed, 4 deletions(-) diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c index 4a3f96e..11d0692 100644 --- a/drivers/media/pci/cx88/cx88-alsa.c +++ b/drivers/media/pci/cx88/cx88-alsa.c @@ -935,8 +935,6 @@ static void cx88_audio_finidev(struct pci_dev *pci) snd_card_free((void *)card); - pci_set_drvdata(pci, NULL); - devno--; } diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c index e31a75f..684eff5 100644 --- a/drivers/media/pci/cx88/cx88-mpeg.c +++ b/drivers/media/pci/cx88/cx88-mpeg.c @@ -520,7 +520,6 @@ static void cx8802_fini_common(struct cx8802_dev *dev) /* unregister stuff */ free_irq(dev->pci->irq, dev); - pci_set_drvdata(dev->pci, NULL); /* free memory */ btcx_riscmem_free(dev->pci,&dev->mpegq.stopper); diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index 356725c..1aed764 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c @@ -1922,7 +1922,6 @@ static void cx8800_finidev(struct pci_dev *pci_dev) free_irq(pci_dev->irq, dev); cx8800_unregister_video(dev); - pci_set_drvdata(pci_dev, NULL); /* free memory */ btcx_riscmem_free(dev->pci,&dev->vidq.stopper);