From patchwork Wed Oct 2 22:09:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Alves X-Patchwork-Id: 20286 X-Patchwork-Delegate: mkrufky@linuxtv.org Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VRUbw-0005bn-VG; Thu, 03 Oct 2013 00:09:36 +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-5) with esmtp id 1VRUbu-0000Cg-9U; Thu, 03 Oct 2013 00:09:36 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753552Ab3JBWJc (ORCPT + 1 other); Wed, 2 Oct 2013 18:09:32 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:39098 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752983Ab3JBWJc (ORCPT ); Wed, 2 Oct 2013 18:09:32 -0400 Received: by mail-wi0-f181.google.com with SMTP id ex4so1666353wid.2 for ; Wed, 02 Oct 2013 15:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=FxH4YxVIW5HD2s72wbMFCORT56SLJBBBDYWTivEYBq8=; b=zmONeWuWkj5XtT0t+L921J13DYUAndzAyk3OPc78KFCUR9VaXWAx2VlrFutNp+/4xj D8+XUTxRZdLdhi1z/1+S9DD5mKwb577te3lPLPXE8fAMN/GackZaVDmc22Uw8ITdxuKt KWlPopd/Jq9Q7eqpkCu6qNOrHL1ubwdd03uctVfcrYXI3xVmrPSZQ8MPGFtQVmlMqhI/ mUe33m6X1s7JHFjXN4WrkmmJsh05rucIrJlDOLJm6aFmvUKIy47VyMXjnEt8D2ggPQFV vvYA6iWc9AGKIlhi/sd3FHAayDkt+Q0nfn4HLVzQqflMERFJvLdooqyLcG02C7Gn0YfU /ctA== X-Received: by 10.180.185.10 with SMTP id ey10mr3983837wic.29.1380751771202; Wed, 02 Oct 2013 15:09:31 -0700 (PDT) Received: from localhost.localdomain (a89-152-209-152.cpe.netcabo.pt. [89.152.209.152]) by mx.google.com with ESMTPSA id dq11sm20580108wid.3.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Oct 2013 15:09:30 -0700 (PDT) From: Luis Alves To: mkrufky@linuxtv.org Cc: crope@iki.fi, linux-media@vger.kernel.org, mchehab@infradead.org, Luis Alves Subject: [PATCH 2/2] cx24117: Removed from cx23885 the no longer needed frontend pointer from the dvb_attach function. Date: Wed, 2 Oct 2013 23:09:27 +0100 Message-Id: <1380751767-4891-1-git-send-email-ljalvs@gmail.com> X-Mailer: git-send-email 1.7.9.5 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.10.2.215620 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, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 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' cx23885 changes: to be used against mkrufky/cx24117 branch Signed-off-by: Luis Alves --- drivers/media/pci/cx23885/cx23885-dvb.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 34120db..0549205 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -1058,20 +1058,13 @@ static int dvb_register(struct cx23885_tsport *port) case 1: fe0->dvb.frontend = dvb_attach(cx24117_attach, &tbs_cx24117_config, - &i2c_bus->i2c_adap, NULL); + &i2c_bus->i2c_adap); break; /* PORT C */ case 2: - /* use fe1 pointer as temporary holder */ - /* for the first frontend */ - fe1 = videobuf_dvb_get_frontend( - &port->dev->ts1.frontends, 1); - fe0->dvb.frontend = dvb_attach(cx24117_attach, &tbs_cx24117_config, - &i2c_bus->i2c_adap, fe1->dvb.frontend); - /* we're done, so clear fe1 pointer */ - fe1 = NULL; + &i2c_bus->i2c_adap); break; } break;