From patchwork Thu Apr 12 12:46:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 10655 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SIJQX-0006lp-Nm for patchwork@linuxtv.org; Thu, 12 Apr 2012 14:47:05 +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.75/mailfrontend-2) with esmtp for id 1SIJQX-0000J7-GD; Thu, 12 Apr 2012 14:47:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933717Ab2DLMrD (ORCPT ); Thu, 12 Apr 2012 08:47:03 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:38987 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757591Ab2DLMrC (ORCPT ); Thu, 12 Apr 2012 08:47:02 -0400 Received: by eaaq12 with SMTP id q12so484136eaa.19 for ; Thu, 12 Apr 2012 05:47:01 -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:x-mailer; bh=+0Tz0/t0HcX7LreucHAy6brDogZwsDIvW9G65Poo2c8=; b=iD7xW2qpL8S65+6sUFhltEKDlfcnGllM9XcfTCeQ9AVvijsl80ZsGMPrfUVEoS4Xz7 i4H40S7i9XMnOEDNgFaofldncoV0zSB8sAywdgehSBhjLPJU2eGMTc7UihsdXAhu2m0E JVK60u3FfRVzAUIFdxhvZRYrhBkSuVqbGfdaOAF4oFF1MXOI97Rd/cJOvUzIOwlcRYHO iFUQJg65Db65pPtZTwYvamU1TjrwDmjBoVDEtA7JnNYxdscR0HOiBD2esRdMMJSf6MPm eM8L2+MQmHFLRh9EJMdXquvm6ueJu9VafRn6VUuNbx6tw2TO6Wuie4VPLrqMDiCxF1ZS k1+w== Received: by 10.14.123.197 with SMTP id v45mr325779eeh.49.1334234821221; Thu, 12 Apr 2012 05:47:01 -0700 (PDT) Received: from localhost.localdomain (93-50-34-119.ip150.fastwebnet.it. [93.50.34.119]) by mx.google.com with ESMTPS id m55sm27421615eei.1.2012.04.12.05.46.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Apr 2012 05:47:00 -0700 (PDT) From: Gianluca Gennari To: linux-media@vger.kernel.org, mchehab@redhat.com Cc: patrick.boettcher@dibcom.fr, olivier.grenie@dibcom.fr, Gianluca Gennari Subject: [PATCH] dib7000p: remove duplicate code and comment Date: Thu, 12 Apr 2012 14:46:51 +0200 Message-Id: <1334234811-13893-1-git-send-email-gennarone@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.4.12.123316 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, 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_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, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Remove duplicate code and comment, probably due to a patch applied twice. Signed-off-by: Gianluca Gennari --- drivers/media/dvb/frontends/dib7000p.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index 5ceadc2..3e1eefa 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c @@ -2396,11 +2396,6 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, more common) */ st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent; - /* FIXME: make sure the dev.parent field is initialized, or else - request_firmware() will hit an OOPS (this should be moved somewhere - more common) */ - st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent; - dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr); /* init 7090 tuner adapter */