From: Sakari Ailus <sakari.ailus@iki.fi>
To: Pavel Machek <pavel@ucw.cz>
Cc: sre@kernel.org, pali.rohar@gmail.com,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
laurent.pinchart@ideasonboard.com, mchehab@kernel.org,
ivo.g.dimitrov.75@gmail.com
Subject: Re: subdevice config into pointer (was Re: [PATCH 1/4] v4l2: device_register_subdev_nodes: allow calling multiple times)
Date: Thu, 2 Mar 2017 16:16:17 +0200 [thread overview]
Message-ID: <20170302141617.GG3220@valkosipuli.retiisi.org.uk> (raw)
In-Reply-To: <20170302090727.GC27818@amd>
Hi Pavel,
On Thu, Mar 02, 2017 at 10:07:27AM +0100, Pavel Machek wrote:
> Hi!
>
> > Making the sub-device bus configuration a pointer should be in a separate
> > patch. It makes sense since the entire configuration is not valid for all
> > sub-devices attached to the ISP anymore. I think it originally was a
> > separate patch, but they probably have been merged at some point. I can't
> > find it right now anyway.
>
> Something like this?
> Pavel
>
> commit df9141c66678b549fac9d143bd55ed0b242cf36e
> Author: Pavel <pavel@ucw.cz>
> Date: Wed Mar 1 13:27:56 2017 +0100
>
> Turn bus in struct isp_async_subdev into pointer; some of our subdevs
> (flash, focus) will not need bus configuration.
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
I applied this to the ccp2 branch with an improved patch description.
>
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index 8a456d4..36bd359 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -2030,12 +2030,18 @@ enum isp_of_phy {
> static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwn,
> struct isp_async_subdev *isd)
> {
> - struct isp_bus_cfg *buscfg = &isd->bus;
> + struct isp_bus_cfg *buscfg;
> struct v4l2_fwnode_endpoint vfwn;
> unsigned int i;
> int ret;
> bool csi1 = false;
>
> + buscfg = devm_kzalloc(dev, sizeof(*isd->bus), GFP_KERNEL);
> + if (!buscfg)
> + return -ENOMEM;
> +
> + isd->bus = buscfg;
> +
> ret = v4l2_fwnode_endpoint_parse(fwn, &vfwn);
> if (ret)
> return ret;
> @@ -2246,7 +2252,7 @@ static int isp_subdev_notifier_bound(struct v4l2_async_notifier *async,
> container_of(asd, struct isp_async_subdev, asd);
>
> isd->sd = subdev;
> - isd->sd->host_priv = &isd->bus;
> + isd->sd->host_priv = isd->bus;
>
> return 0;
> }
> diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h
> index 7e6f663..c0b9d1d 100644
> --- a/drivers/media/platform/omap3isp/isp.h
> +++ b/drivers/media/platform/omap3isp/isp.h
> @@ -228,7 +228,7 @@ struct isp_device {
>
> struct isp_async_subdev {
> struct v4l2_subdev *sd;
> - struct isp_bus_cfg bus;
> + struct isp_bus_cfg *bus;
> struct v4l2_async_subdev asd;
> };
>
> diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c
> index f20abe8..be23408 100644
> --- a/drivers/media/platform/omap3isp/ispcsiphy.c
> +++ b/drivers/media/platform/omap3isp/ispcsiphy.c
> @@ -202,7 +202,7 @@ static int omap3isp_csiphy_config(struct isp_csiphy *phy)
> struct isp_async_subdev *isd =
> container_of(pipe->external->asd,
> struct isp_async_subdev, asd);
> - buscfg = &isd->bus;
> + buscfg = isd->bus;
> }
>
> if (buscfg->interface == ISP_INTERFACE_CCP2B_PHY1
>
>
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
next prev parent reply other threads:[~2017-03-02 14:42 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 22:38 [PATCH 1/4] v4l2: device_register_subdev_nodes: allow calling multiple times Pavel Machek
2017-02-14 22:38 ` [PATCH 2/4] Core changes for CCP2/CSI1 support Pavel Machek
2017-02-14 22:39 ` [PATCH 3/4] smiapp: add CCP2 support Pavel Machek
2017-02-14 22:39 ` [PATCH 4/4] v4l: split lane parsing code Pavel Machek
2017-02-20 10:31 ` [PATCH 1/4] v4l2: device_register_subdev_nodes: allow calling multiple times Pavel Machek
2017-02-20 13:09 ` Sakari Ailus
2017-02-20 13:56 ` Sakari Ailus
2017-02-21 11:07 ` Pavel Machek
2017-02-21 11:11 ` Sakari Ailus
2017-02-23 22:52 ` Pavel Machek
2017-02-25 0:09 ` Pavel Machek
2017-02-25 13:44 ` Sakari Ailus
2017-02-25 21:53 ` camera subdevice support was " Pavel Machek
2017-02-25 22:56 ` Pavel Machek
2017-02-25 23:17 ` Sakari Ailus
2017-02-26 8:38 ` Pavel Machek
2017-02-26 21:36 ` Sakari Ailus
2017-03-04 8:55 ` Pavel Machek
2017-03-04 12:30 ` Sakari Ailus
2017-03-04 19:05 ` Pavel Machek
2017-03-04 19:20 ` Pavel Machek
2017-03-02 9:07 ` subdevice config into pointer (was Re: [PATCH 1/4] v4l2: device_register_subdev_nodes: allow calling multiple times) Pavel Machek
2017-03-02 14:16 ` Sakari Ailus [this message]
2017-03-02 14:58 ` Pavel Machek
2017-03-02 15:13 ` Sakari Ailus
2017-03-03 23:24 ` Pavel Machek
2017-03-02 18:39 ` Laurent Pinchart
2017-03-02 21:03 ` Pavel Machek
2017-03-02 21:18 ` Sakari Ailus
2017-02-25 22:12 ` [PATCH 1/4] v4l2: device_register_subdev_nodes: allow calling multiple times Pavel Machek
2017-02-27 19:43 ` Pavel Machek
2017-02-27 20:54 ` Sakari Ailus
2017-02-28 9:17 ` Pavel Machek
2017-02-28 11:38 ` [PATCH] omap3isp: Parse CSI1 configuration from the device tree Pavel Machek
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=20170302141617.GG3220@valkosipuli.retiisi.org.uk \
--to=sakari.ailus@iki.fi \
--cc=ivo.g.dimitrov.75@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=pali.rohar@gmail.com \
--cc=pavel@ucw.cz \
--cc=sre@kernel.org \
/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).