From patchwork Sun Oct 7 15:38:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 1561421 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 32A45DFF71 for ; Sun, 7 Oct 2012 15:39:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753516Ab2JGPji (ORCPT ); Sun, 7 Oct 2012 11:39:38 -0400 Received: from mail4-relais-sop.national.inria.fr ([192.134.164.105]:18945 "EHLO mail4-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752944Ab2JGPjX (ORCPT ); Sun, 7 Oct 2012 11:39:23 -0400 X-IronPort-AV: E=Sophos;i="4.80,547,1344204000"; d="scan'208";a="158166844" Received: from palace.lip6.fr (HELO localhost.localdomain) ([132.227.105.202]) by mail4-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Oct 2012 17:39:18 +0200 From: Julia Lawall To: Michael Krufky Cc: kernel-janitors@vger.kernel.org, rmallon@gmail.com, shubhrajyoti@ti.com, Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/13] drivers/media/tuners/tda18271-common.c: use macros for i2c_msg initialization Date: Sun, 7 Oct 2012 17:38:37 +0200 Message-Id: <1349624323-15584-8-git-send-email-Julia.Lawall@lip6.fr> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1349624323-15584-1-git-send-email-Julia.Lawall@lip6.fr> References: <1349624323-15584-1-git-send-email-Julia.Lawall@lip6.fr> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Julia Lawall Introduce use of I2c_MSG_READ/WRITE/OP, for readability. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression a,b,c; identifier x; @@ struct i2c_msg x = - {.addr = a, .buf = b, .len = c, .flags = I2C_M_RD} + I2C_MSG_READ(a,b,c) ; @@ expression a,b,c; identifier x; @@ struct i2c_msg x = - {.addr = a, .buf = b, .len = c, .flags = 0} + I2C_MSG_WRITE(a,b,c) ; @@ expression a,b,c,d; identifier x; @@ struct i2c_msg x = - {.addr = a, .buf = b, .len = c, .flags = d} + I2C_MSG_OP(a,b,c,d) ; // Signed-off-by: Julia Lawall --- drivers/media/tuners/tda18271-common.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/tuners/tda18271-common.c b/drivers/media/tuners/tda18271-common.c index 221171e..d05ed53 100644 --- a/drivers/media/tuners/tda18271-common.c +++ b/drivers/media/tuners/tda18271-common.c @@ -125,10 +125,8 @@ int tda18271_read_regs(struct dvb_frontend *fe) unsigned char buf = 0x00; int ret; struct i2c_msg msg[] = { - { .addr = priv->i2c_props.addr, .flags = 0, - .buf = &buf, .len = 1 }, - { .addr = priv->i2c_props.addr, .flags = I2C_M_RD, - .buf = regs, .len = 16 } + I2C_MSG_WRITE(priv->i2c_props.addr, &buf, sizeof(buf)), + I2C_MSG_READ(priv->i2c_props.addr, regs, 16) }; tda18271_i2c_gate_ctrl(fe, 1); @@ -155,10 +153,8 @@ int tda18271_read_extended(struct dvb_frontend *fe) unsigned char buf = 0x00; int ret, i; struct i2c_msg msg[] = { - { .addr = priv->i2c_props.addr, .flags = 0, - .buf = &buf, .len = 1 }, - { .addr = priv->i2c_props.addr, .flags = I2C_M_RD, - .buf = regdump, .len = TDA18271_NUM_REGS } + I2C_MSG_WRITE(priv->i2c_props.addr, &buf, sizeof(buf)), + I2C_MSG_READ(priv->i2c_props.addr, regdump, sizeof(regdump)) }; tda18271_i2c_gate_ctrl(fe, 1); @@ -192,8 +188,7 @@ int tda18271_write_regs(struct dvb_frontend *fe, int idx, int len) struct tda18271_priv *priv = fe->tuner_priv; unsigned char *regs = priv->tda18271_regs; unsigned char buf[TDA18271_NUM_REGS + 1]; - struct i2c_msg msg = { .addr = priv->i2c_props.addr, .flags = 0, - .buf = buf }; + struct i2c_msg msg = I2C_MSG_WRITE(priv->i2c_props.addr, buf, 0); int i, ret = 1, max; BUG_ON((len == 0) || (idx + len > sizeof(buf)));