Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753790Ab2JGPkt (ORCPT ); Sun, 7 Oct 2012 11:40:49 -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 S1753448Ab2JGPj1 (ORCPT ); Sun, 7 Oct 2012 11:39:27 -0400 X-IronPort-AV: E=Sophos;i="4.80,547,1344204000"; d="scan'208";a="158166855" From: Julia Lawall To: Mauro Carvalho Chehab Cc: kernel-janitors@vger.kernel.org, rmallon@gmail.com, shubhrajyoti@ti.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/13] drivers/media/tuners/max2165.c: use macros for i2c_msg initialization Date: Sun, 7 Oct 2012 17:38:43 +0200 Message-Id: <1349624323-15584-14-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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2723 Lines: 101 From: Julia Lawall Introduce use of I2c_MSG_READ/WRITE/OP, for readability. A length expressed as an explicit constant is also re-expressed as the size of the buffer, when this is possible. The second case is simplified to use simple variables rather than arrays. The variable b0 is dropped completely, and the variable reg that it contains is used instead. The variable b1 is replaced by a u8-typed variable named buf (the name used earlier in the file). The uses of b1 are then adjusted accordingly. 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/max2165.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/media/tuners/max2165.c b/drivers/media/tuners/max2165.c index ba84936..6638617 100644 --- a/drivers/media/tuners/max2165.c +++ b/drivers/media/tuners/max2165.c @@ -47,7 +47,7 @@ static int max2165_write_reg(struct max2165_priv *priv, u8 reg, u8 data) { int ret; u8 buf[] = { reg, data }; - struct i2c_msg msg = { .flags = 0, .buf = buf, .len = 2 }; + struct i2c_msg msg = I2C_MSG_WRITE(0, buf, sizeof(buf)); msg.addr = priv->config->i2c_address; @@ -68,11 +68,10 @@ static int max2165_read_reg(struct max2165_priv *priv, u8 reg, u8 *p_data) int ret; u8 dev_addr = priv->config->i2c_address; - u8 b0[] = { reg }; - u8 b1[] = { 0 }; + u8 buf; struct i2c_msg msg[] = { - { .addr = dev_addr, .flags = 0, .buf = b0, .len = 1 }, - { .addr = dev_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 }, + I2C_MSG_WRITE(dev_addr, ®, sizeof(reg)), + I2C_MSG_READ(dev_addr, &buf, sizeof(buf)), }; ret = i2c_transfer(priv->i2c, msg, 2); @@ -81,10 +80,10 @@ static int max2165_read_reg(struct max2165_priv *priv, u8 reg, u8 *p_data) return -EIO; } - *p_data = b1[0]; + *p_data = buf; if (debug >= 2) dprintk("%s: reg=0x%02X, data=0x%02X\n", - __func__, reg, b1[0]); + __func__, reg, buf); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/