From: Marco Felsch <m.felsch@pengutronix.de>
To: mchehab@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com
Cc: kernel@pengutronix.de, devicetree@vger.kernel.org,
p.zabel@pengutronix.de, javierm@redhat.com,
laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com,
afshin.nasser@gmail.com, linux-media@vger.kernel.org
Subject: [PATCH v2 3/7] [media] v4l2-subdev: add stubs for v4l2_subdev_get_try_*
Date: Mon, 13 Aug 2018 11:25:04 +0200 [thread overview]
Message-ID: <20180813092508.1334-4-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20180813092508.1334-1-m.felsch@pengutronix.de>
In case of missing CONFIG_VIDEO_V4L2_SUBDEV_API those helpers aren't
available. So each driver have to add ifdefs around those helpers or
add the CONFIG_VIDEO_V4L2_SUBDEV_API as dependcy.
Make these helpers available in case of CONFIG_VIDEO_V4L2_SUBDEV_API
isn't set to avoid ifdefs. This approach is less error prone too.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
include/media/v4l2-subdev.h | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 9102d6ca566e..ce48f1fcf295 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -912,8 +912,6 @@ struct v4l2_subdev_fh {
#define to_v4l2_subdev_fh(fh) \
container_of(fh, struct v4l2_subdev_fh, vfh)
-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
-
/**
* v4l2_subdev_get_try_format - ancillary routine to call
* &struct v4l2_subdev_pad_config->try_fmt
@@ -927,9 +925,13 @@ static inline struct v4l2_mbus_framefmt
struct v4l2_subdev_pad_config *cfg,
unsigned int pad)
{
+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
if (WARN_ON(pad >= sd->entity.num_pads))
pad = 0;
return &cfg[pad].try_fmt;
+#else
+ return NULL;
+#endif
}
/**
@@ -945,9 +947,13 @@ static inline struct v4l2_rect
struct v4l2_subdev_pad_config *cfg,
unsigned int pad)
{
+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
if (WARN_ON(pad >= sd->entity.num_pads))
pad = 0;
return &cfg[pad].try_crop;
+#else
+ return NULL;
+#endif
}
/**
@@ -963,11 +969,14 @@ static inline struct v4l2_rect
struct v4l2_subdev_pad_config *cfg,
unsigned int pad)
{
+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
if (WARN_ON(pad >= sd->entity.num_pads))
pad = 0;
return &cfg[pad].try_compose;
-}
+#else
+ return NULL;
#endif
+}
extern const struct v4l2_file_operations v4l2_subdev_fops;
--
2.18.0
next prev parent reply other threads:[~2018-08-13 12:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-13 9:25 [PATCH v2 0/7] TVP5150 fixes and new features Marco Felsch
2018-08-13 9:25 ` [PATCH v2 1/7] [media] tvp5150: add input source selection of_graph support Marco Felsch
2018-09-14 13:31 ` Sakari Ailus
2018-09-14 17:54 ` Marco Felsch
2018-08-13 9:25 ` [PATCH v2 2/7] [media] dt-bindings: tvp5150: Add input port connectors DT bindings Marco Felsch
2018-08-13 21:41 ` Rob Herring
2018-08-14 16:10 ` Marco Felsch
2018-08-13 9:25 ` Marco Felsch [this message]
2018-08-13 9:25 ` [PATCH v2 4/7] [media] v4l2-subdev: fix v4l2_subdev_get_try_* dependency Marco Felsch
2018-09-14 13:25 ` Sakari Ailus
2018-09-14 18:10 ` Marco Felsch
2018-08-13 9:25 ` [PATCH v2 5/7] [media] tvp5150: add FORMAT_TRY support for get/set selection handlers Marco Felsch
2018-08-13 9:25 ` [PATCH v2 6/7] [media] tvp5150: initialize subdev before parsing device tree Marco Felsch
2018-08-13 9:25 ` [PATCH v2 7/7] [media] tvp5150: add s_power callback Marco Felsch
2018-09-14 13:23 ` Sakari Ailus
2018-09-14 18:20 ` Marco Felsch
2018-09-14 18:57 ` Mauro Carvalho Chehab
2018-09-18 9:51 ` Marco Felsch
2018-09-14 8:43 ` [PATCH v2 0/7] TVP5150 fixes and new features Marco Felsch
2018-09-14 9:37 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180813092508.1334-4-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=afshin.nasser@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=javierm@redhat.com \
--cc=kernel@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).