aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/soc_camera.h
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-10-29 23:51:46 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:26 -0500
commitaf128a102c4aee994b4ff6e422b3cfab17127578 (patch)
treed56dbca4fcc265411f6f43b175d266fb2f9fea45 /include/media/soc_camera.h
parent9b2fb337a1423be53c671c4937fd4651cb30618e (diff)
V4L/DVB (9521): V4L: struct device - replace bus_id with dev_name(), dev_set_name()
This patch is part of a larger patch series which will remove the "char bus_id[20]" name string from struct device. The device name is managed in the kobject anyway, and without any size limitation, and just needlessly copied into "struct device". To set and read the device name dev_name(dev) and dev_set_name(dev) must be used. If your code uses static kobjects, which it shouldn't do, "const char *init_name" can be used to statically provide the name the registered device should have. At registration time, the init_name field is cleared, to enforce the use of dev_name(dev) to access the device name at a later time. We need to get rid of all occurrences of bus_id in the entire tree to be able to enable the new interface. Please apply this patch, and possibly convert any remaining remaining occurrences of bus_id. We want to submit a patch to -next, which will remove bus_id from "struct device", to find the remaining pieces to convert, and finally switch over to the new api, which will remove the 20 bytes array and does no longer have a size limitation. Thanks, Kay Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/soc_camera.h')
-rw-r--r--include/media/soc_camera.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index c5de7bb19fda..9231e2d908f2 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -56,7 +56,7 @@ struct soc_camera_host {
56 struct device dev; 56 struct device dev;
57 unsigned char nr; /* Host number */ 57 unsigned char nr; /* Host number */
58 void *priv; 58 void *priv;
59 char *drv_name; 59 const char *drv_name;
60 struct soc_camera_host_ops *ops; 60 struct soc_camera_host_ops *ops;
61}; 61};
62 62
@@ -107,7 +107,7 @@ extern int soc_camera_video_start(struct soc_camera_device *icd);
107extern void soc_camera_video_stop(struct soc_camera_device *icd); 107extern void soc_camera_video_stop(struct soc_camera_device *icd);
108 108
109struct soc_camera_data_format { 109struct soc_camera_data_format {
110 char *name; 110 const char *name;
111 unsigned int depth; 111 unsigned int depth;
112 __u32 fourcc; 112 __u32 fourcc;
113 enum v4l2_colorspace colorspace; 113 enum v4l2_colorspace colorspace;