diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 08:05:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 08:05:56 -0800 |
| commit | 53f517a1f61ce69bf67898891d5b14ffaada0003 (patch) | |
| tree | da77afc9776822f1b55d7d29f7b869518e0722db /drivers/staging | |
| parent | 04ed0978d5ca5a3460a6f1f7443f8147a183669f (diff) | |
| parent | 9a1f8b34aa539000da17a06235e4bec254d0bfb5 (diff) | |
| download | kernel_samsung_tuna-53f517a1f61ce69bf67898891d5b14ffaada0003.zip kernel_samsung_tuna-53f517a1f61ce69bf67898891d5b14ffaada0003.tar.gz kernel_samsung_tuna-53f517a1f61ce69bf67898891d5b14ffaada0003.tar.bz2 | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions
[media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/go7007/go7007-driver.c | 2 | ||||
| -rw-r--r-- | drivers/staging/tm6000/tm6000-cards.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c index b3f42f3..48d4e48 100644 --- a/drivers/staging/go7007/go7007-driver.c +++ b/drivers/staging/go7007/go7007-driver.c @@ -199,7 +199,7 @@ static int init_i2c_module(struct i2c_adapter *adapter, const char *type, struct go7007 *go = i2c_get_adapdata(adapter); struct v4l2_device *v4l2_dev = &go->v4l2_dev; - if (v4l2_i2c_new_subdev(v4l2_dev, adapter, NULL, type, addr, NULL)) + if (v4l2_i2c_new_subdev(v4l2_dev, adapter, type, addr, NULL)) return 0; printk(KERN_INFO "go7007: probing for module i2c:%s failed\n", type); diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 664e603..b143258 100644 --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -545,7 +545,7 @@ static void tm6000_config_tuner(struct tm6000_core *dev) /* Load tuner module */ v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap, - NULL, "tuner", dev->tuner_addr, NULL); + "tuner", dev->tuner_addr, NULL); memset(&tun_setup, 0, sizeof(tun_setup)); tun_setup.type = dev->tuner_type; @@ -683,7 +683,7 @@ static int tm6000_init_dev(struct tm6000_core *dev) if (dev->caps.has_tda9874) v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap, - NULL, "tvaudio", I2C_ADDR_TDA9874, NULL); + "tvaudio", I2C_ADDR_TDA9874, NULL); /* register and initialize V4L2 */ rc = tm6000_v4l2_register(dev); |