From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: devicetree@vger.kernel.org, slongerbeam@gmail.com,
niklas.soderlund@ragnatech.se, jacopo@jmondi.org
Subject: [PATCH v2 17/23] v4l: fwnode: Only zero the struct if bus type is set to V4L2_MBUS_UNKNOWN
Date: Mon, 27 Aug 2018 12:29:54 +0300 [thread overview]
Message-ID: <20180827093000.29165-18-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20180827093000.29165-1-sakari.ailus@linux.intel.com>
In order to prepare for allowing drivers to set the defaults for a given
bus, make zeroing the struct conditional based on detecting the bus.
All callers now set the bus type to zero which allows only zeroing the
remaining bus union.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-fwnode.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index ba51c1ead314..6c5a76442667 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -325,6 +325,12 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
u32 bus_type = 0;
int rval;
+ if (vep->bus_type == V4L2_MBUS_UNKNOWN) {
+ /* Zero fields from bus union to until the end */
+ memset(&vep->bus, 0,
+ sizeof(*vep) - offsetof(typeof(*vep), bus));
+ }
+
pr_debug("===== begin V4L2 endpoint properties\n");
/*
@@ -333,10 +339,6 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
*/
memset(&vep->base, 0, sizeof(vep->base));
- /* Zero fields from bus_type to until the end */
- memset(&vep->bus_type, 0, sizeof(*vep) -
- offsetof(typeof(*vep), bus_type));
-
fwnode_property_read_u32(fwnode, "bus-type", &bus_type);
switch (bus_type) {
--
2.11.0
next prev parent reply other threads:[~2018-08-27 13:15 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-27 9:29 [PATCH v2 00/23] V4L2 fwnode rework; support for default configuration Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 01/23] v4l: fwnode: Add debug prints for V4L2 endpoint property parsing Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 02/23] v4l: fwnode: Use fwnode_graph_for_each_endpoint Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 03/23] v4l: fwnode: The CSI-2 clock is continuous if it's not non-continuous Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 04/23] dt-bindings: media: Specify bus type for MIPI D-PHY, others, explicitly Sakari Ailus
2018-08-29 0:45 ` Rob Herring
2018-08-27 9:29 ` [PATCH v2 05/23] v4l: fwnode: Add definitions for CSI-2 D-PHY, parallel and Bt.656 busses Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 06/23] v4l: mediabus: Recognise CSI-2 D-PHY and C-PHY Sakari Ailus
2018-08-31 8:02 ` [PATCH v2.1 " Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 07/23] v4l: fwnode: Let the caller provide V4L2 fwnode endpoint Sakari Ailus
2018-09-12 14:51 ` jacopo mondi
2018-09-12 20:46 ` Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 08/23] v4l: fwnode: Detect bus type correctly Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 09/23] v4l: fwnode: Make use of newly specified bus types Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 10/23] v4l: fwnode: Read lane inversion information despite lane numbering Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 11/23] v4l: fwnode: Only assign configuration if there is no error Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 12/23] v4l: fwnode: Support driver-defined lane mapping defaults Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 13/23] v4l: fwnode: Support default CSI-2 lane mapping for drivers Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 14/23] v4l: fwnode: Parse the graph endpoint as last Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 15/23] v4l: fwnode: Use default parallel flags Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 16/23] v4l: fwnode: Initialise the V4L2 fwnode endpoints to zero Sakari Ailus
2018-08-27 9:29 ` Sakari Ailus [this message]
2018-08-27 9:29 ` [PATCH v2 18/23] v4l: fwnode: Use media bus type for bus parser selection Sakari Ailus
2018-09-12 15:15 ` jacopo mondi
2018-09-12 20:53 ` Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 19/23] v4l: fwnode: Print bus type Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 20/23] v4l: fwnode: Use V4L2 fwnode endpoint media bus type if set Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 21/23] v4l: fwnode: Support parsing of CSI-2 C-PHY endpoints Sakari Ailus
2018-08-27 9:29 ` [PATCH v2 22/23] v4l: fwnode: Update V4L2 fwnode endpoint parsing documentation Sakari Ailus
2018-08-27 9:30 ` [PATCH v2 23/23] smiapp: Query the V4L2 endpoint for a specific bus type Sakari Ailus
2018-08-29 0:53 ` [PATCH v2 00/23] V4L2 fwnode rework; support for default configuration Steve Longerbeam
2018-08-29 12:52 ` Sakari Ailus
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=20180827093000.29165-18-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=jacopo@jmondi.org \
--cc=linux-media@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=slongerbeam@gmail.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).