From patchwork Tue Dec 23 20:49:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 5535241 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 83FE3BEEA8 for ; Tue, 23 Dec 2014 20:51:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 959672011D for ; Tue, 23 Dec 2014 20:51:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 766992018E for ; Tue, 23 Dec 2014 20:51:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756624AbaLWUve (ORCPT ); Tue, 23 Dec 2014 15:51:34 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:43813 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756623AbaLWUub (ORCPT ); Tue, 23 Dec 2014 15:50:31 -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 1Y3WPW-0004tE-0A; Tue, 23 Dec 2014 22:50:30 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari Subject: [PATCH 23/66] rtl2832: add platform data callbacks for exported resources Date: Tue, 23 Dec 2014 22:49:16 +0200 Message-Id: <1419367799-14263-23-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 Add callback for all of those functions which are currently exported using EXPORT_SYMBOL. That allows us convert every user to callbacks and eventually all exported symbols could be removed. Signed-off-by: Antti Palosaari --- drivers/media/dvb-frontends/rtl2832.c | 90 +++++++++++++++++++++++++++++++---- drivers/media/dvb-frontends/rtl2832.h | 7 +++ 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index 9597ae1..4e77ef2 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c @@ -1183,6 +1183,80 @@ static struct dvb_frontend_ops rtl2832_ops = { .i2c_gate_ctrl = rtl2832_i2c_gate_ctrl, }; +static struct dvb_frontend *rtl2832_get_dvb_frontend(struct i2c_client *client) +{ + struct rtl2832_priv *dev = i2c_get_clientdata(client); + + dev_dbg(&client->dev, "\n"); + return &dev->fe; +} + +static struct i2c_adapter *rtl2832_get_i2c_adapter_(struct i2c_client *client) +{ + struct rtl2832_priv *dev = i2c_get_clientdata(client); + + dev_dbg(&client->dev, "\n"); + return dev->i2c_adapter_tuner; +} + +static struct i2c_adapter *rtl2832_get_private_i2c_adapter_(struct i2c_client *client) +{ + struct rtl2832_priv *dev = i2c_get_clientdata(client); + + dev_dbg(&client->dev, "\n"); + return dev->i2c_adapter; +} + +static int rtl2832_enable_slave_ts(struct i2c_client *client) +{ + struct rtl2832_priv *dev = i2c_get_clientdata(client); + int ret; + + dev_dbg(&client->dev, "setting PIP mode\n"); + + ret = rtl2832_wr_regs(dev, 0x0c, 1, "\x5f\xff", 2); + if (ret) + goto err; + + ret = rtl2832_wr_demod_reg(dev, DVBT_PIP_ON, 0x1); + if (ret) + goto err; + + ret = rtl2832_wr_reg(dev, 0xbc, 0, 0x18); + if (ret) + goto err; + + ret = rtl2832_wr_reg(dev, 0x22, 0, 0x01); + if (ret) + goto err; + + ret = rtl2832_wr_reg(dev, 0x26, 0, 0x1f); + if (ret) + goto err; + + ret = rtl2832_wr_reg(dev, 0x27, 0, 0xff); + if (ret) + goto err; + + ret = rtl2832_wr_regs(dev, 0x92, 1, "\x7f\xf7\xff", 3); + if (ret) + goto err; + + /* soft reset */ + ret = rtl2832_wr_demod_reg(dev, DVBT_SOFT_RST, 0x1); + if (ret) + goto err; + + ret = rtl2832_wr_demod_reg(dev, DVBT_SOFT_RST, 0x0); + if (ret) + goto err; + + return 0; +err: + dev_dbg(&client->dev, "failed=%d\n", ret); + return ret; +} + static int rtl2832_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -1200,13 +1274,6 @@ static int rtl2832_probe(struct i2c_client *client, goto err; } - /* Caller really need to provide pointer for frontend we create. */ - if (pdata->dvb_frontend == NULL) { - dev_err(&client->dev, "frontend pointer not defined\n"); - ret = -EINVAL; - goto err; - } - /* allocate memory for the internal state */ priv = kzalloc(sizeof(struct rtl2832_priv), GFP_KERNEL); if (priv == NULL) { @@ -1248,7 +1315,14 @@ static int rtl2832_probe(struct i2c_client *client, priv->fe.ops.release = NULL; priv->fe.demodulator_priv = priv; i2c_set_clientdata(client, priv); - *pdata->dvb_frontend = &priv->fe; + if (pdata->dvb_frontend) + *pdata->dvb_frontend = &priv->fe; + + /* setup callbacks */ + pdata->get_dvb_frontend = rtl2832_get_dvb_frontend; + pdata->get_i2c_adapter = rtl2832_get_i2c_adapter_; + pdata->get_private_i2c_adapter = rtl2832_get_private_i2c_adapter_; + pdata->enable_slave_ts = rtl2832_enable_slave_ts; dev_info(&client->dev, "Realtek RTL2832 successfully attached\n"); return 0; diff --git a/drivers/media/dvb-frontends/rtl2832.h b/drivers/media/dvb-frontends/rtl2832.h index cfd69d8..dbc4d3c 100644 --- a/drivers/media/dvb-frontends/rtl2832.h +++ b/drivers/media/dvb-frontends/rtl2832.h @@ -58,6 +58,13 @@ struct rtl2832_platform_data { * returned by driver */ struct dvb_frontend **dvb_frontend; + + /* + */ + struct dvb_frontend* (*get_dvb_frontend)(struct i2c_client *); + struct i2c_adapter* (*get_i2c_adapter)(struct i2c_client *); + struct i2c_adapter* (*get_private_i2c_adapter)(struct i2c_client *); + int (*enable_slave_ts)(struct i2c_client *); }; #if IS_ENABLED(CONFIG_DVB_RTL2832)