[3/5] mb86a20s: remove two uneeded macros

Commit Message

Mauro Carvalho Chehab Jan. 1, 2015, 3:51 p.m. UTC

There are two macros that are there just to simplify the parameter
passage. Remove them, as the i2c address is already inside the
i2c client structure.

Signed-off-by: Mauro Carvalho Chehab <[e-mail]>

Patch

diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c
index 8dd608be1edd..7d6a688f6f12 100644
--- a/drivers/media/dvb-frontends/mb86a20s.c
+++ b/drivers/media/dvb-frontends/mb86a20s.c
@@ -224,12 +224,12 @@  static struct regdata mb86a20s_per_ber_reset[] = {
  * I2C read/write functions and macros
  */
 
-static int mb86a20s_i2c_writereg(struct mb86a20s_state *state,
-			     u8 i2c_addr, u8 reg, u8 data)
+static int mb86a20s_writereg(struct mb86a20s_state *state,
+			     u8 reg, u8 data)
 {
 	u8 buf[] = { reg, data };
 	struct i2c_msg msg = {
-		.addr = i2c_addr, .flags = 0, .buf = buf, .len = 2
+		.addr = state->i2c->addr, .flags = 0, .buf = buf, .len = 2
 	};
 	int rc;
 
@@ -245,27 +245,25 @@  static int mb86a20s_i2c_writereg(struct mb86a20s_state *state,
 }
 
 static int mb86a20s_i2c_writeregdata(struct mb86a20s_state *state,
-				     u8 i2c_addr, struct regdata *rd, int size)
+				 struct regdata *rd, int size)
 {
 	int i, rc;
 
 	for (i = 0; i < size; i++) {
-		rc = mb86a20s_i2c_writereg(state, i2c_addr, rd[i].reg,
-					   rd[i].data);
+		rc = mb86a20s_writereg(state, rd[i].reg, rd[i].data);
 		if (rc < 0)
 			return rc;
 	}
 	return 0;
 }
 
-static int mb86a20s_i2c_readreg(struct mb86a20s_state *state,
-				u8 i2c_addr, u8 reg)
+static int mb86a20s_readreg(struct mb86a20s_state *state, u8 reg)
 {
 	u8 val;
 	int rc;
 	struct i2c_msg msg[] = {
-		{ .addr = i2c_addr, .flags = 0, .buf = &reg, .len = 1 },
-		{ .addr = i2c_addr, .flags = I2C_M_RD, .buf = &val, .len = 1 }
+		{ .addr = state->i2c->addr, .flags = 0, .buf = &reg, .len = 1 },
+		{ .addr = state->i2c->addr, .flags = I2C_M_RD, .buf = &val, .len = 1 }
 	};
 
 	rc = i2c_transfer(state->i2c->adapter, msg, 2);
@@ -279,12 +277,8 @@  static int mb86a20s_i2c_readreg(struct mb86a20s_state *state,
 	return val;
 }
 
-#define mb86a20s_readreg(state, reg) \
-	mb86a20s_i2c_readreg(state, state->i2c->addr, reg)
-#define mb86a20s_writereg(state, reg, val) \
-	mb86a20s_i2c_writereg(state, state->i2c->addr, reg, val)
 #define mb86a20s_writeregdata(state, regdata) \
-	mb86a20s_i2c_writeregdata(state, state->i2c->addr, \
+	mb86a20s_i2c_writeregdata(state, \
 	regdata, ARRAY_SIZE(regdata))
 
 /*