diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-25 07:39:50 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:41 -0500 |
commit | 505b6d0b774fa4475fedbd3cebf95199c17a0086 (patch) | |
tree | ea8fe176eba79808734e5d23241f67d0dbd1cc91 /drivers/media/video/em28xx/em28xx-i2c.c | |
parent | d4d889e329bd0837598b3ef611806421754e9b83 (diff) |
V4L/DVB (9752): Remove duplicated fields on em28xx_board and em28xx structs
Several fields are duplicated on both structs. Let's just copy em28xx_board instead.
A later cleanup could just copy the fields that are changed, in order to keep em28xx_board
const.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-i2c.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index ec3e3b157ba8..78d60231ee3f 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -250,7 +250,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
250 | (msgs[i].flags & I2C_M_RD) ? "read" : "write", | 250 | (msgs[i].flags & I2C_M_RD) ? "read" : "write", |
251 | i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len); | 251 | i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len); |
252 | if (!msgs[i].len) { /* no len: check only for device presence */ | 252 | if (!msgs[i].len) { /* no len: check only for device presence */ |
253 | if (dev->is_em2800) | 253 | if (dev->board.is_em2800) |
254 | rc = em2800_i2c_check_for_device(dev, addr); | 254 | rc = em2800_i2c_check_for_device(dev, addr); |
255 | else | 255 | else |
256 | rc = em28xx_i2c_check_for_device(dev, addr); | 256 | rc = em28xx_i2c_check_for_device(dev, addr); |
@@ -261,7 +261,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
261 | 261 | ||
262 | } else if (msgs[i].flags & I2C_M_RD) { | 262 | } else if (msgs[i].flags & I2C_M_RD) { |
263 | /* read bytes */ | 263 | /* read bytes */ |
264 | if (dev->is_em2800) | 264 | if (dev->board.is_em2800) |
265 | rc = em2800_i2c_recv_bytes(dev, addr, | 265 | rc = em2800_i2c_recv_bytes(dev, addr, |
266 | msgs[i].buf, | 266 | msgs[i].buf, |
267 | msgs[i].len); | 267 | msgs[i].len); |
@@ -279,7 +279,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
279 | for (byte = 0; byte < msgs[i].len; byte++) | 279 | for (byte = 0; byte < msgs[i].len; byte++) |
280 | printk(" %02x", msgs[i].buf[byte]); | 280 | printk(" %02x", msgs[i].buf[byte]); |
281 | } | 281 | } |
282 | if (dev->is_em2800) | 282 | if (dev->board.is_em2800) |
283 | rc = em2800_i2c_send_bytes(dev, addr, | 283 | rc = em2800_i2c_send_bytes(dev, addr, |
284 | msgs[i].buf, | 284 | msgs[i].buf, |
285 | msgs[i].len); | 285 | msgs[i].len); |