diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-01 16:31:35 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 22:56:08 +0200 |
commit | d33b290a149dafe2e3cc2901ec726bea09a2c0f4 (patch) | |
tree | 3669b43f2dc2726f2029ef97d2ee424b70c30a7b | |
parent | [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier (diff) | |
download | linux-d33b290a149dafe2e3cc2901ec726bea09a2c0f4.tar.xz linux-d33b290a149dafe2e3cc2901ec726bea09a2c0f4.zip |
[media] V4L: soc-camera: un-export the soc-camera bus
The soc-camera bus is now completely local again.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/soc_camera.c | 3 | ||||
-rw-r--r-- | include/media/soc_camera.h | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 96bed292c548..0df31b54e906 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -1207,12 +1207,11 @@ static int soc_camera_remove(struct device *dev) return 0; } -struct bus_type soc_camera_bus_type = { +static struct bus_type soc_camera_bus_type = { .name = "soc-camera", .probe = soc_camera_probe, .remove = soc_camera_remove, }; -EXPORT_SYMBOL_GPL(soc_camera_bus_type); static struct device_driver ic_drv = { .name = "camera", diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 70c4ea5ecc31..c31d55be3e17 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -20,12 +20,10 @@ #include <media/videobuf2-core.h> #include <media/v4l2-device.h> -extern struct bus_type soc_camera_bus_type; - struct file; struct soc_camera_device { - struct list_head list; + struct list_head list; /* list of all registered devices */ struct device dev; struct device *pdev; /* Platform device */ s32 user_width; @@ -126,8 +124,8 @@ struct soc_camera_link { int num_regulators; /* - * For non-I2C devices platform platform has to provide methods to - * add a device to the system and to remove + * For non-I2C devices platform has to provide methods to add a device + * to the system and to remove it */ int (*add_device)(struct soc_camera_link *, struct device *); void (*del_device)(struct soc_camera_link *); |