From patchwork Fri Dec 5 10:55:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 27330 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XwqYW-0003dk-9z; Fri, 05 Dec 2014 11:56:12 +0100 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 1XwqYU-00007v-6Y; Fri, 05 Dec 2014 11:56:11 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751282AbaLEK4H (ORCPT + 1 other); Fri, 5 Dec 2014 05:56:07 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:58009 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751132AbaLEK4G (ORCPT ); Fri, 5 Dec 2014 05:56:06 -0500 Received: by mail-pa0-f47.google.com with SMTP id kq14so493990pab.6 for ; Fri, 05 Dec 2014 02:56:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Fma6B45aMKgak6Bgsv4K4P8H1272GKwneNauCvAdVak=; b=QiQ38Kqcu2tBPFyF5GZ+axWQ2ELSTMHNtmXeZtSbJVGpFWvWBpXfBXN3lslKbkM1MS XtdmVw4hTjJa2fonRvekOMi34AojxsmrTISVoquPtPPDBf5lm0TcB1Onh1cCdHIB4TO0 XmWYrYUYYsPTTseH3tevHtglWblU24WuQGdSU4MHbfzcB08CJKS9rHvSWN3GnEz1mNmo 05gxBWXcmvcWgLpYxhuY69Y7aWSNhhtdP3xqjGClRdst8MIRr34pJTmRzOS4YIpNyHE8 JOBplKKStX1ReMgwL5nwe5OZlKMdHJFmhOSyRalMybaj0I3TngvsSDIpDPlgQ4Q/vjjT O2PQ== X-Received: by 10.68.57.144 with SMTP id i16mr34278922pbq.86.1417776965925; Fri, 05 Dec 2014 02:56:05 -0800 (PST) Received: from seabird.localdomain.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by mx.google.com with ESMTPSA id ac17sm18338035pac.35.2014.12.05.02.56.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Dec 2014 02:56:04 -0800 (PST) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, Akihiro Tsukada Subject: [PATCH 1/5] dvb: qm1d1c0042: use dvb-core i2c binding model template Date: Fri, 5 Dec 2014 19:55:36 +0900 Message-Id: <1417776940-16381-2-git-send-email-tskd08@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1417776940-16381-1-git-send-email-tskd08@gmail.com> References: <1417776940-16381-1-git-send-email-tskd08@gmail.com> In-Reply-To: <1417776573-16182-1-git-send-email-tskd08@gmail.com> References: <1417776573-16182-1-git-send-email-tskd08@gmail.com> 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: 2014.12.5.104520 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, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, NO_REAL_NAME 0, REFERENCES 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, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Akihiro Tsukada Signed-off-by: Akihiro Tsukada --- drivers/media/tuners/qm1d1c0042.c | 61 +++++++++++++-------------------------- drivers/media/tuners/qm1d1c0042.h | 2 -- 2 files changed, 20 insertions(+), 43 deletions(-) diff --git a/drivers/media/tuners/qm1d1c0042.c b/drivers/media/tuners/qm1d1c0042.c index 18bc745..f1f4bec 100644 --- a/drivers/media/tuners/qm1d1c0042.c +++ b/drivers/media/tuners/qm1d1c0042.c @@ -29,6 +29,7 @@ #include #include +#include "dvb_i2c.h" #include "qm1d1c0042.h" #define QM1D1C0042_NUM_REGS 0x20 @@ -55,11 +56,6 @@ struct qm1d1c0042_state { u8 regs[QM1D1C0042_NUM_REGS]; }; -static struct qm1d1c0042_state *cfg_to_state(struct qm1d1c0042_config *c) -{ - return container_of(c, struct qm1d1c0042_state, cfg); -} - static int reg_write(struct qm1d1c0042_state *state, u8 reg, u8 val) { u8 wbuf[2] = { reg, val }; @@ -106,10 +102,12 @@ static int qm1d1c0042_set_srch_mode(struct qm1d1c0042_state *state, bool fast) return reg_write(state, 0x03, state->regs[0x03]); } -static int qm1d1c0042_wakeup(struct qm1d1c0042_state *state) +static int qm1d1c0042_wakeup(struct dvb_frontend *fe) { + struct qm1d1c0042_state *state; int ret; + state = fe->tuner_priv; state->regs[0x01] |= 1 << 3; /* BB_Reg_enable */ state->regs[0x01] &= (~(1 << 0)) & 0xff; /* NORMAL (wake-up) */ state->regs[0x05] &= (~(1 << 3)) & 0xff; /* pfd_rst NORMAL */ @@ -119,7 +117,7 @@ static int qm1d1c0042_wakeup(struct qm1d1c0042_state *state) if (ret < 0) dev_warn(&state->i2c->dev, "(%s) failed. [adap%d-fe%d]\n", - __func__, state->cfg.fe->dvb->num, state->cfg.fe->id); + __func__, fe->dvb->num, fe->id); return ret; } @@ -133,9 +131,6 @@ static int qm1d1c0042_set_config(struct dvb_frontend *fe, void *priv_cfg) state = fe->tuner_priv; cfg = priv_cfg; - if (cfg->fe) - state->cfg.fe = cfg->fe; - if (cfg->xtal_freq != QM1D1C0042_CFG_XTAL_DFLT) dev_warn(&state->i2c->dev, "(%s) changing xtal_freq not supported. ", __func__); @@ -359,7 +354,7 @@ static int qm1d1c0042_init(struct dvb_frontend *fe) goto failed; } - ret = qm1d1c0042_wakeup(state); + ret = qm1d1c0042_wakeup(fe); if (ret < 0) goto failed; @@ -395,53 +390,37 @@ static const struct dvb_tuner_ops qm1d1c0042_ops = { static int qm1d1c0042_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct qm1d1c0042_state *state; - struct qm1d1c0042_config *cfg; + struct dvb_i2c_tuner_config *tcfg; struct dvb_frontend *fe; + struct qm1d1c0042_state *state; - state = kzalloc(sizeof(*state), GFP_KERNEL); - if (!state) - return -ENOMEM; +dev_info(&client->dev, "qm1d1c0042_probe().\n"); + tcfg = client->dev.platform_data; + fe = tcfg->fe; + state = fe->tuner_priv; state->i2c = client; - cfg = client->dev.platform_data; - fe = cfg->fe; - fe->tuner_priv = state; - qm1d1c0042_set_config(fe, cfg); - memcpy(&fe->ops.tuner_ops, &qm1d1c0042_ops, sizeof(qm1d1c0042_ops)); + qm1d1c0042_set_config(fe, (void *)tcfg->devcfg.priv_cfg); - i2c_set_clientdata(client, &state->cfg); dev_info(&client->dev, "Sharp QM1D1C0042 attached.\n"); return 0; } -static int qm1d1c0042_remove(struct i2c_client *client) -{ - struct qm1d1c0042_state *state; - - state = cfg_to_state(i2c_get_clientdata(client)); - state->cfg.fe->tuner_priv = NULL; - kfree(state); - return 0; -} - static const struct i2c_device_id qm1d1c0042_id[] = { {"qm1d1c0042", 0}, {} }; -MODULE_DEVICE_TABLE(i2c, qm1d1c0042_id); -static struct i2c_driver qm1d1c0042_driver = { - .driver = { - .name = "qm1d1c0042", - }, - .probe = qm1d1c0042_probe, - .remove = qm1d1c0042_remove, - .id_table = qm1d1c0042_id, +static const struct dvb_i2c_module_param qm1d1c0042_param = { + .ops.tuner_ops = &qm1d1c0042_ops, + .priv_probe = qm1d1c0042_probe, + + .priv_size = sizeof(struct qm1d1c0042_state), + .is_tuner = true, }; -module_i2c_driver(qm1d1c0042_driver); +DEFINE_DVB_I2C_MODULE(qm1d1c0042, qm1d1c0042_id, qm1d1c0042_param); MODULE_DESCRIPTION("Sharp QM1D1C0042 tuner"); MODULE_AUTHOR("Akihiro TSUKADA"); diff --git a/drivers/media/tuners/qm1d1c0042.h b/drivers/media/tuners/qm1d1c0042.h index 4f5c188..043787e 100644 --- a/drivers/media/tuners/qm1d1c0042.h +++ b/drivers/media/tuners/qm1d1c0042.h @@ -21,8 +21,6 @@ struct qm1d1c0042_config { - struct dvb_frontend *fe; - u32 xtal_freq; /* [kHz] */ /* currently ignored */ bool lpf; /* enable LPF */ bool fast_srch; /* enable fast search mode, no LPF */