diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-08-10 07:49:08 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-08-10 07:49:08 +0200 |
| commit | 78b537e32fbc1e45a9d5fe1086c4e6c303661e53 (patch) | |
| tree | 132abee06a31e1259fa5e8de9d895897dd7a12c8 /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | 731b07aacdb288bdc2e0d55090224470c064cac0 (diff) | |
| download | mediapointer-dvb-s2-78b537e32fbc1e45a9d5fe1086c4e6c303661e53.tar.gz mediapointer-dvb-s2-78b537e32fbc1e45a9d5fe1086c4e6c303661e53.tar.bz2 | |
v4l: simplify v4l2_i2c_new_subdev and friends
From: Hans Verkuil <hverkuil@xs4all.nl>
Rewrite v4l2_i2c_new_subdev as a simplified version of v4l2_i2c_new_subdev_cfg
and remove v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr.
This simplifies this API substantially.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index e466afd18..d0080370f 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1061,7 +1061,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, struct v4l2_subdev *sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap, "saa6752hs", "saa6752hs", - saa7134_boards[dev->board].empress_addr); + saa7134_boards[dev->board].empress_addr, NULL); if (sd) sd->grp_id = GRP_EMPRESS; @@ -1070,9 +1070,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, if (saa7134_boards[dev->board].rds_addr) { struct v4l2_subdev *sd; - sd = v4l2_i2c_new_probed_subdev_addr(&dev->v4l2_dev, + sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap, "saa6588", "saa6588", - saa7134_boards[dev->board].rds_addr); + 0, I2C_ADDRS(saa7134_boards[dev->board].rds_addr)); if (sd) { printk(KERN_INFO "%s: found RDS decoder\n", dev->name); dev->has_rds = 1; |