aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-26 09:01:42 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-21 09:45:42 -0400
commitaee38734d2e2a908c4fd50918f28f19c088abfb9 (patch)
tree560fceabafb39a93a1de693b5528dbca5fbfe235 /drivers/media/v4l2-core
parent6ec19898ed6990baa285b8c96a8b1a0d0366bc46 (diff)
[media] v4l2-common: remove unused v4l2_chip_match/ident_i2c_client functions
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r--drivers/media/v4l2-core/v4l2-common.c47
1 files changed, 1 insertions, 46 deletions
diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 5fd76609e613..3b2a7606bc84 100644
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -61,7 +61,6 @@
61#include <media/v4l2-common.h> 61#include <media/v4l2-common.h>
62#include <media/v4l2-device.h> 62#include <media/v4l2-device.h>
63#include <media/v4l2-ctrls.h> 63#include <media/v4l2-ctrls.h>
64#include <media/v4l2-chip-ident.h>
65 64
66#include <linux/videodev2.h> 65#include <linux/videodev2.h>
67 66
@@ -227,51 +226,9 @@ u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id)
227} 226}
228EXPORT_SYMBOL(v4l2_ctrl_next); 227EXPORT_SYMBOL(v4l2_ctrl_next);
229 228
230#if IS_ENABLED(CONFIG_I2C)
231int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match)
232{
233 int len;
234
235 if (c == NULL || match == NULL)
236 return 0;
237
238 switch (match->type) {
239 case V4L2_CHIP_MATCH_I2C_DRIVER:
240 if (c->driver == NULL || c->driver->driver.name == NULL)
241 return 0;
242 len = strlen(c->driver->driver.name);
243 return len && !strncmp(c->driver->driver.name, match->name, len);
244 case V4L2_CHIP_MATCH_I2C_ADDR:
245 return c->addr == match->addr;
246 case V4L2_CHIP_MATCH_SUBDEV:
247 return 1;
248 default:
249 return 0;
250 }
251}
252EXPORT_SYMBOL(v4l2_chip_match_i2c_client);
253
254int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_dbg_chip_ident *chip,
255 u32 ident, u32 revision)
256{
257 if (!v4l2_chip_match_i2c_client(c, &chip->match))
258 return 0;
259 if (chip->ident == V4L2_IDENT_NONE) {
260 chip->ident = ident;
261 chip->revision = revision;
262 }
263 else {
264 chip->ident = V4L2_IDENT_AMBIGUOUS;
265 chip->revision = 0;
266 }
267 return 0;
268}
269EXPORT_SYMBOL(v4l2_chip_ident_i2c_client);
270
271/* ----------------------------------------------------------------- */
272
273/* I2C Helper functions */ 229/* I2C Helper functions */
274 230
231#if IS_ENABLED(CONFIG_I2C)
275 232
276void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client, 233void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
277 const struct v4l2_subdev_ops *ops) 234 const struct v4l2_subdev_ops *ops)
@@ -290,8 +247,6 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
290} 247}
291EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init); 248EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
292 249
293
294
295/* Load an i2c sub-device. */ 250/* Load an i2c sub-device. */
296struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev, 251struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
297 struct i2c_adapter *adapter, struct i2c_board_info *info, 252 struct i2c_adapter *adapter, struct i2c_board_info *info,