From: Ben Dooks <ben.dooks@codethink.co.uk>
To: linux-media@vger.kernel.org, linux-sh@vger.kernel.org
Cc: magnus.damm@opensource.se, horms@verge.net.au,
g.liakhovetski@gmx.de, linux-kernel@lists.codethink.co.uk,
Ben Dooks <ben.dooks@codethink.co.uk>
Subject: [PATCH 2/6] rcar_vin: copy flags from pdata
Date: Sat, 05 Jul 2014 22:26:21 +0000 [thread overview]
Message-ID: <1404599185-12353-3-git-send-email-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <1404599185-12353-1-git-send-email-ben.dooks@codethink.co.uk>
The platform data is a single word, so simply copy
it into the device's private data structure than
keeping a copy of the pointer.
This will make changing to device-tree binding
easier as it is one allocation instead of two.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
drivers/media/platform/soc_camera/rcar_vin.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index e594230..7c4299d 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -126,13 +126,13 @@ struct rcar_vin_priv {
int sequence;
/* State of the VIN module in capturing mode */
enum rcar_vin_state state;
- struct rcar_vin_platform_data *pdata;
struct soc_camera_host ici;
struct list_head capture;
#define MAX_BUFFER_NUM 3
struct vb2_buffer *queue_buf[MAX_BUFFER_NUM];
struct vb2_alloc_ctx *alloc_ctx;
enum v4l2_field field;
+ unsigned int pdata_flags;
unsigned int vb_count;
unsigned int nr_hw_slots;
bool request_to_stop;
@@ -275,12 +275,12 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
break;
case V4L2_MBUS_FMT_YUYV8_2X8:
/* BT.656 8bit YCbCr422 or BT.601 8bit YCbCr422 */
- vnmc |= priv->pdata->flags & RCAR_VIN_BT656 ?
+ vnmc |= priv->pdata_flags & RCAR_VIN_BT656 ?
VNMC_INF_YUV8_BT656 : VNMC_INF_YUV8_BT601;
break;
case V4L2_MBUS_FMT_YUYV10_2X10:
/* BT.656 10bit YCbCr422 or BT.601 10bit YCbCr422 */
- vnmc |= priv->pdata->flags & RCAR_VIN_BT656 ?
+ vnmc |= priv->pdata_flags & RCAR_VIN_BT656 ?
VNMC_INF_YUV10_BT656 : VNMC_INF_YUV10_BT601;
break;
default:
@@ -797,7 +797,7 @@ static int rcar_vin_set_bus_param(struct soc_camera_device *icd)
/* Make choises, based on platform preferences */
if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
(common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
- if (priv->pdata->flags & RCAR_VIN_HSYNC_ACTIVE_LOW)
+ if (priv->pdata_flags & RCAR_VIN_HSYNC_ACTIVE_LOW)
common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
else
common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
@@ -805,7 +805,7 @@ static int rcar_vin_set_bus_param(struct soc_camera_device *icd)
if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
(common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
- if (priv->pdata->flags & RCAR_VIN_VSYNC_ACTIVE_LOW)
+ if (priv->pdata_flags & RCAR_VIN_VSYNC_ACTIVE_LOW)
common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
else
common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
@@ -1445,7 +1445,7 @@ static int rcar_vin_probe(struct platform_device *pdev)
priv->ici.drv_name = dev_name(&pdev->dev);
priv->ici.ops = &rcar_vin_host_ops;
- priv->pdata = pdata;
+ priv->pdata_flags = pdata->flags;
priv->chip = pdev->id_entry->driver_data;
spin_lock_init(&priv->lock);
INIT_LIST_HEAD(&priv->capture);
--
2.0.0
next prev parent reply other threads:[~2014-07-05 22:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-05 22:26 rcar-vin & soc-camera device tree updates Ben Dooks
2014-07-05 22:26 ` [PATCH 1/6] adv7180: Remove duplicate unregister call Ben Dooks
2014-07-17 7:37 ` Hans Verkuil
2014-07-05 22:26 ` Ben Dooks [this message]
2014-07-05 22:26 ` [PATCH 3/6] rcar_vin: add devicetree support Ben Dooks
2014-07-23 10:20 ` Guennadi Liakhovetski
2014-07-23 18:23 ` [PATCH v6 " Guennadi Liakhovetski
2014-07-25 7:30 ` Ben Dooks
2014-07-05 22:26 ` [PATCH 4/6] [V3] soc_camera: add support for dt binding soc_camera drivers Ben Dooks
2014-07-23 18:00 ` Guennadi Liakhovetski
2014-07-23 18:01 ` [PATCH v6 4/6] " Guennadi Liakhovetski
2014-07-25 3:23 ` Josh Wu
2014-07-05 22:26 ` [PATCH 5/6] r8a7790.dtsi: add vin[0-3] nodes Ben Dooks
2014-07-23 8:09 ` Guennadi Liakhovetski
2014-07-23 8:40 ` Simon Horman
2014-07-05 22:26 ` [PATCH 6/6] [PATCH v2] ARM: lager: add vin1 node Ben Dooks
2014-07-23 8:11 ` Guennadi Liakhovetski
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=1404599185-12353-3-git-send-email-ben.dooks@codethink.co.uk \
--to=ben.dooks@codethink.co.uk \
--cc=g.liakhovetski@gmx.de \
--cc=horms@verge.net.au \
--cc=linux-kernel@lists.codethink.co.uk \
--cc=linux-media@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@opensource.se \
/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).