summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-25 10:39:50 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-25 10:39:50 -0200
commit648862d26603ff7d30334417fda9c5d8bfa0871a (patch)
treec1ee210105cadd3188b33ddbbd4c4fc433b2a870 /linux/drivers/media/video/em28xx/em28xx-i2c.c
parent7a8e65e6272706e69c47c96e865ec1170c1e1564 (diff)
downloadmediapointer-dvb-s2-648862d26603ff7d30334417fda9c5d8bfa0871a.tar.gz
mediapointer-dvb-s2-648862d26603ff7d30334417fda9c5d8bfa0871a.tar.bz2
Remove duplicated fields on em28xx_board and em28xx structs
From: Mauro Carvalho Chehab <mchehab@redhat.com> 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. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-i2c.c')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-i2c.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c
index 4e6fa575d..adc5ab20f 100644
--- a/linux/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c
@@ -250,7 +250,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap,
(msgs[i].flags & I2C_M_RD) ? "read" : "write",
i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len);
if (!msgs[i].len) { /* no len: check only for device presence */
- if (dev->is_em2800)
+ if (dev->board.is_em2800)
rc = em2800_i2c_check_for_device(dev, addr);
else
rc = em28xx_i2c_check_for_device(dev, addr);
@@ -261,7 +261,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap,
} else if (msgs[i].flags & I2C_M_RD) {
/* read bytes */
- if (dev->is_em2800)
+ if (dev->board.is_em2800)
rc = em2800_i2c_recv_bytes(dev, addr,
msgs[i].buf,
msgs[i].len);
@@ -279,7 +279,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap,
for (byte = 0; byte < msgs[i].len; byte++)
printk(" %02x", msgs[i].buf[byte]);
}
- if (dev->is_em2800)
+ if (dev->board.is_em2800)
rc = em2800_i2c_send_bytes(dev, addr,
msgs[i].buf,
msgs[i].len);