diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-15 19:03:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:56:08 -0400 |
commit | 7dfff95366f48bf66f77c17cdc9ebd8be696ac5d (patch) | |
tree | c4cb975f5b8b8c3008921d38fa6e4deed9c8dbc9 /drivers/media/video/tw9910.c | |
parent | d33b290a149dafe2e3cc2901ec726bea09a2c0f4 (diff) |
[media] V4L: soc-camera: remove soc-camera bus and devices on it
Now that v4l2 subdevices have got their own device objects, having
one more device in soc-camera clients became redundant and confusing.
This patch removes those devices and the soc-camera bus, they used to
reside on.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tw9910.c')
-rw-r--r-- | drivers/media/video/tw9910.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c index a722f66c3f23..742482e30011 100644 --- a/drivers/media/video/tw9910.c +++ b/drivers/media/video/tw9910.c | |||
@@ -836,13 +836,9 @@ static int tw9910_video_probe(struct soc_camera_device *icd, | |||
836 | struct tw9910_priv *priv = to_tw9910(client); | 836 | struct tw9910_priv *priv = to_tw9910(client); |
837 | s32 id; | 837 | s32 id; |
838 | 838 | ||
839 | /* | 839 | /* We must have a parent by now. And it cannot be a wrong one. */ |
840 | * We must have a parent by now. And it cannot be a wrong one. | 840 | BUG_ON(!icd->parent || |
841 | * So this entire test is completely redundant. | 841 | to_soc_camera_host(icd->parent)->nr != icd->iface); |
842 | */ | ||
843 | if (!icd->dev.parent || | ||
844 | to_soc_camera_host(icd->dev.parent)->nr != icd->iface) | ||
845 | return -ENODEV; | ||
846 | 842 | ||
847 | /* | 843 | /* |
848 | * tw9910 only use 8 or 16 bit bus width | 844 | * tw9910 only use 8 or 16 bit bus width |