diff options
Diffstat (limited to 'drivers/media/video/omap3isp/ispstat.c')
-rw-r--r-- | drivers/media/video/omap3isp/ispstat.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c index bf0e5a771857..b124326d1e7f 100644 --- a/drivers/media/video/omap3isp/ispstat.c +++ b/drivers/media/video/omap3isp/ispstat.c | |||
@@ -1023,24 +1023,6 @@ void omap3isp_stat_dma_isr(struct ispstat *stat) | |||
1023 | __stat_isr(stat, 1); | 1023 | __stat_isr(stat, 1); |
1024 | } | 1024 | } |
1025 | 1025 | ||
1026 | static int isp_stat_init_entities(struct ispstat *stat, const char *name, | ||
1027 | const struct v4l2_subdev_ops *sd_ops) | ||
1028 | { | ||
1029 | struct v4l2_subdev *subdev = &stat->subdev; | ||
1030 | struct media_entity *me = &subdev->entity; | ||
1031 | |||
1032 | v4l2_subdev_init(subdev, sd_ops); | ||
1033 | snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "OMAP3 ISP %s", name); | ||
1034 | subdev->grp_id = 1 << 16; /* group ID for isp subdevs */ | ||
1035 | subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE; | ||
1036 | v4l2_set_subdevdata(subdev, stat); | ||
1037 | |||
1038 | stat->pad.flags = MEDIA_PAD_FL_SINK; | ||
1039 | me->ops = NULL; | ||
1040 | |||
1041 | return media_entity_init(me, 1, &stat->pad, 0); | ||
1042 | } | ||
1043 | |||
1044 | int omap3isp_stat_subscribe_event(struct v4l2_subdev *subdev, | 1026 | int omap3isp_stat_subscribe_event(struct v4l2_subdev *subdev, |
1045 | struct v4l2_fh *fh, | 1027 | struct v4l2_fh *fh, |
1046 | struct v4l2_event_subscription *sub) | 1028 | struct v4l2_event_subscription *sub) |
@@ -1071,6 +1053,24 @@ int omap3isp_stat_register_entities(struct ispstat *stat, | |||
1071 | return v4l2_device_register_subdev(vdev, &stat->subdev); | 1053 | return v4l2_device_register_subdev(vdev, &stat->subdev); |
1072 | } | 1054 | } |
1073 | 1055 | ||
1056 | static int isp_stat_init_entities(struct ispstat *stat, const char *name, | ||
1057 | const struct v4l2_subdev_ops *sd_ops) | ||
1058 | { | ||
1059 | struct v4l2_subdev *subdev = &stat->subdev; | ||
1060 | struct media_entity *me = &subdev->entity; | ||
1061 | |||
1062 | v4l2_subdev_init(subdev, sd_ops); | ||
1063 | snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "OMAP3 ISP %s", name); | ||
1064 | subdev->grp_id = 1 << 16; /* group ID for isp subdevs */ | ||
1065 | subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE; | ||
1066 | v4l2_set_subdevdata(subdev, stat); | ||
1067 | |||
1068 | stat->pad.flags = MEDIA_PAD_FL_SINK; | ||
1069 | me->ops = NULL; | ||
1070 | |||
1071 | return media_entity_init(me, 1, &stat->pad, 0); | ||
1072 | } | ||
1073 | |||
1074 | int omap3isp_stat_init(struct ispstat *stat, const char *name, | 1074 | int omap3isp_stat_init(struct ispstat *stat, const char *name, |
1075 | const struct v4l2_subdev_ops *sd_ops) | 1075 | const struct v4l2_subdev_ops *sd_ops) |
1076 | { | 1076 | { |