From patchwork Tue Dec 23 20:49:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 5535141 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 78765BEEA8 for ; Tue, 23 Dec 2014 20:51:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B29EF200F4 for ; Tue, 23 Dec 2014 20:51:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C03F12012D for ; Tue, 23 Dec 2014 20:51:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756680AbaLWUvK (ORCPT ); Tue, 23 Dec 2014 15:51:10 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:60104 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756640AbaLWUud (ORCPT ); Tue, 23 Dec 2014 15:50:33 -0500 Received: from dyn3-82-128-190-202.psoas.suomi.net ([82.128.190.202] helo=localhost.localdomain.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Y3WPY-0004tE-5O; Tue, 23 Dec 2014 22:50:32 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari Subject: [PATCH 37/66] rtl2832: drop FE i2c gate control support Date: Tue, 23 Dec 2014 22:49:30 +0200 Message-Id: <1419367799-14263-37-git-send-email-crope@iki.fi> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1419367799-14263-1-git-send-email-crope@iki.fi> References: <1419367799-14263-1-git-send-email-crope@iki.fi> X-SA-Exim-Connect-IP: 82.128.190.202 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We don't need it anymore as all users are using muxed I2C adapter. Signed-off-by: Antti Palosaari --- drivers/media/dvb-frontends/rtl2832.c | 33 ------------------------------ drivers/media/dvb-frontends/rtl2832_priv.h | 1 - 2 files changed, 34 deletions(-) diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index 39c8f34..94d08fb 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c @@ -309,30 +309,6 @@ err: } -static int rtl2832_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) -{ - struct rtl2832_dev *dev = fe->demodulator_priv; - struct i2c_client *client = dev->client; - int ret; - - dev_dbg(&client->dev, "enable=%d\n", enable); - - /* gate already open or close */ - if (dev->i2c_gate_state == enable) - return 0; - - ret = rtl2832_wr_demod_reg(dev, DVBT_IIC_REPEAT, (enable ? 0x1 : 0x0)); - if (ret) - goto err; - - dev->i2c_gate_state = enable; - - return ret; -err: - dev_dbg(&client->dev, "failed=%d\n", ret); - return ret; -} - static int rtl2832_set_if(struct dvb_frontend *fe, u32 if_freq) { struct rtl2832_dev *dev = fe->demodulator_priv; @@ -932,8 +908,6 @@ static void rtl2832_i2c_gate_work(struct work_struct *work) if (ret) goto err; - dev->i2c_gate_state = false; - return; err: dev_dbg(&client->dev, "failed=%d\n", ret); @@ -949,9 +923,6 @@ static int rtl2832_select(struct i2c_adapter *adap, void *mux_priv, u32 chan_id) /* terminate possible gate closing */ cancel_delayed_work(&dev->i2c_gate_work); - if (dev->i2c_gate_state == chan_id) - return 0; - /* * chan_id 1 is muxed adapter demod provides and chan_id 0 is demod * itself. We need open gate when request is for chan_id 1. On that case @@ -965,8 +936,6 @@ static int rtl2832_select(struct i2c_adapter *adap, void *mux_priv, u32 chan_id) if (ret) goto err; - dev->i2c_gate_state = chan_id; - return 0; err: dev_dbg(&client->dev, "failed=%d\n", ret); @@ -1017,8 +986,6 @@ static struct dvb_frontend_ops rtl2832_ops = { .read_status = rtl2832_read_status, .read_snr = rtl2832_read_snr, .read_ber = rtl2832_read_ber, - - .i2c_gate_ctrl = rtl2832_i2c_gate_ctrl, }; /* diff --git a/drivers/media/dvb-frontends/rtl2832_priv.h b/drivers/media/dvb-frontends/rtl2832_priv.h index a44614c..6f3fe77 100644 --- a/drivers/media/dvb-frontends/rtl2832_priv.h +++ b/drivers/media/dvb-frontends/rtl2832_priv.h @@ -39,7 +39,6 @@ struct rtl2832_dev { u64 post_bit_error_prev; /* for old DVBv3 read_ber() calculation */ u64 post_bit_error; u64 post_bit_count; - bool i2c_gate_state; bool sleeping; struct delayed_work i2c_gate_work; };