mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 14:27:48 +00:00
Koen Kooi
104 lines
3.7 KiB
Diff
104 lines
3.7 KiB
Diff
From 7acd77b0cdf013213a6513a75ee5bc2c3e92e1a1 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Date: Wed, 9 Dec 2009 12:38:52 +0100
|
|
Subject: [PATCH 05/43] v4l: subdev: Uninline the v4l2_subdev_init function
|
|
|
|
The function isn't small or performance sensitive enough to be inlined.
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
---
|
|
drivers/media/video/v4l2-subdev.c | 42 +++++++++++++++++++++++++-----------
|
|
include/media/v4l2-subdev.h | 16 +------------
|
|
2 files changed, 31 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
|
|
index 00bd4b1..0deff78 100644
|
|
--- a/drivers/media/video/v4l2-subdev.c
|
|
+++ b/drivers/media/video/v4l2-subdev.c
|
|
@@ -1,22 +1,23 @@
|
|
/*
|
|
- * V4L2 subdevice support.
|
|
+ * V4L2 sub-device
|
|
*
|
|
- * Copyright (C) 2010 Nokia Corporation
|
|
+ * Copyright (C) 2010 Nokia Corporation
|
|
*
|
|
- * Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
+ * Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
+ * Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
|
|
*
|
|
- * This program is free software; you can redistribute it and/or modify
|
|
- * it under the terms of the GNU General Public License as published by
|
|
- * the Free Software Foundation.
|
|
+ * This program is free software; you can redistribute it and/or modify
|
|
+ * it under the terms of the GNU General Public License version 2 as
|
|
+ * published by the Free Software Foundation.
|
|
*
|
|
- * This program is distributed in the hope that it will be useful,
|
|
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
- * GNU General Public License for more details.
|
|
+ * This program is distributed in the hope that it will be useful,
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+ * GNU General Public License for more details.
|
|
*
|
|
- * You should have received a copy of the GNU General Public License
|
|
- * along with this program; if not, write to the Free Software
|
|
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
+ * You should have received a copy of the GNU General Public License
|
|
+ * along with this program; if not, write to the Free Software
|
|
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
@@ -64,3 +65,18 @@ const struct v4l2_file_operations v4l2_subdev_fops = {
|
|
.unlocked_ioctl = subdev_ioctl,
|
|
.release = subdev_close,
|
|
};
|
|
+
|
|
+void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops)
|
|
+{
|
|
+ INIT_LIST_HEAD(&sd->list);
|
|
+ BUG_ON(!ops);
|
|
+ sd->ops = ops;
|
|
+ sd->v4l2_dev = NULL;
|
|
+ sd->flags = 0;
|
|
+ sd->name[0] = '\0';
|
|
+ sd->grp_id = 0;
|
|
+ sd->dev_priv = NULL;
|
|
+ sd->host_priv = NULL;
|
|
+ sd->initialized = 1;
|
|
+}
|
|
+EXPORT_SYMBOL(v4l2_subdev_init);
|
|
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
|
|
index de181db..90022f5 100644
|
|
--- a/include/media/v4l2-subdev.h
|
|
+++ b/include/media/v4l2-subdev.h
|
|
@@ -473,20 +473,8 @@ static inline void *v4l2_get_subdev_hostdata(const struct v4l2_subdev *sd)
|
|
return sd->host_priv;
|
|
}
|
|
|
|
-static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
|
|
- const struct v4l2_subdev_ops *ops)
|
|
-{
|
|
- INIT_LIST_HEAD(&sd->list);
|
|
- BUG_ON(!ops);
|
|
- sd->ops = ops;
|
|
- sd->v4l2_dev = NULL;
|
|
- sd->flags = 0;
|
|
- sd->name[0] = '\0';
|
|
- sd->grp_id = 0;
|
|
- sd->dev_priv = NULL;
|
|
- sd->host_priv = NULL;
|
|
- sd->initialized = 1;
|
|
-}
|
|
+void v4l2_subdev_init(struct v4l2_subdev *sd,
|
|
+ const struct v4l2_subdev_ops *ops);
|
|
|
|
/* Call an ops of a v4l2_subdev, doing the right checks against
|
|
NULL pointers.
|
|
--
|
|
1.6.6.1
|
|
|