From: Paul Kocialkowski <paul.kocialkowski@bootlin.com> To: Maxime Ripard <maxime.ripard@bootlin.com>, hans.verkuil@cisco.com, acourbot@chromium.org, sakari.ailus@linux.intel.com, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: tfiga@chromium.org, posciak@chromium.org, Chen-Yu Tsai <wens@csie.org>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, nicolas.dufresne@collabora.com, jenskuske@gmail.com, linux-sunxi@googlegroups.com, Thomas Petazzoni <thomas.petazzoni@bootlin.com> Subject: Re: [PATCH 2/9] media: cedrus: Add wrappers around container_of for our buffers Date: Thu, 21 Jun 2018 11:03:11 +0200 [thread overview] Message-ID: <d19e2594f11963b218d7f09b4a50e9df36330dbe.camel@bootlin.com> (raw) In-Reply-To: <20180613140714.1686-3-maxime.ripard@bootlin.com> [-- Attachment #1: Type: text/plain, Size: 2592 bytes --] Hi, On Wed, 2018-06-13 at 16:07 +0200, Maxime Ripard wrote: > The cedrus driver sub-classes the vb2_v4l2_buffer structure, but doesn't > provide any function to wrap around the proper container_of call that needs > to be duplicated in every calling site. > > Add wrappers to make sure its opaque to the users and they don't have to > care anymore. > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > .../platform/sunxi/cedrus/sunxi_cedrus_common.h | 12 ++++++++++++ > .../media/platform/sunxi/cedrus/sunxi_cedrus_hw.c | 4 ++-- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h > index ee6883ef9cb7..b1ed1c8cb130 100644 > --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h > +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h > @@ -89,6 +89,18 @@ struct sunxi_cedrus_buffer { > struct list_head list; > }; > > +static inline I'm not a big fan of spreading the type qualifiers on two distinct lines instead of having a longer single line (reminds me of the GNU coding style a bit), but this is purely cosmetic. Cheers, Paul > +struct sunxi_cedrus_buffer *vb2_v4l2_to_cedrus_buffer(const struct vb2_v4l2_buffer *p) > +{ > + return container_of(p, struct sunxi_cedrus_buffer, vb); > +} > + > +static inline > +struct sunxi_cedrus_buffer *vb2_to_cedrus_buffer(const struct vb2_buffer *p) > +{ > + return vb2_v4l2_to_cedrus_buffer(to_vb2_v4l2_buffer(p)); > +} > + > struct sunxi_cedrus_dev { > struct v4l2_device v4l2_dev; > struct video_device vfd; > diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c > index 5783bd985855..fc688a5c1ea3 100644 > --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c > +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c > @@ -108,8 +108,8 @@ static irqreturn_t sunxi_cedrus_ve_irq(int irq, void *dev_id) > return IRQ_HANDLED; > } > > - src_buffer = container_of(src_vb, struct sunxi_cedrus_buffer, vb); > - dst_buffer = container_of(dst_vb, struct sunxi_cedrus_buffer, vb); > + src_buffer = vb2_v4l2_to_cedrus_buffer(src_vb); > + dst_buffer = vb2_v4l2_to_cedrus_buffer(dst_vb); > > /* First bit of MPEG_STATUS indicates success. */ > if (ctx->job_abort || !(status & 0x01)) -- Paul Kocialkowski, Bootlin (formerly Free Electrons) Embedded Linux and kernel engineering https://bootlin.com [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: paul.kocialkowski@bootlin.com (Paul Kocialkowski) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/9] media: cedrus: Add wrappers around container_of for our buffers Date: Thu, 21 Jun 2018 11:03:11 +0200 [thread overview] Message-ID: <d19e2594f11963b218d7f09b4a50e9df36330dbe.camel@bootlin.com> (raw) In-Reply-To: <20180613140714.1686-3-maxime.ripard@bootlin.com> Hi, On Wed, 2018-06-13 at 16:07 +0200, Maxime Ripard wrote: > The cedrus driver sub-classes the vb2_v4l2_buffer structure, but doesn't > provide any function to wrap around the proper container_of call that needs > to be duplicated in every calling site. > > Add wrappers to make sure its opaque to the users and they don't have to > care anymore. > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > .../platform/sunxi/cedrus/sunxi_cedrus_common.h | 12 ++++++++++++ > .../media/platform/sunxi/cedrus/sunxi_cedrus_hw.c | 4 ++-- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h > index ee6883ef9cb7..b1ed1c8cb130 100644 > --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h > +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_common.h > @@ -89,6 +89,18 @@ struct sunxi_cedrus_buffer { > struct list_head list; > }; > > +static inline I'm not a big fan of spreading the type qualifiers on two distinct lines instead of having a longer single line (reminds me of the GNU coding style a bit), but this is purely cosmetic. Cheers, Paul > +struct sunxi_cedrus_buffer *vb2_v4l2_to_cedrus_buffer(const struct vb2_v4l2_buffer *p) > +{ > + return container_of(p, struct sunxi_cedrus_buffer, vb); > +} > + > +static inline > +struct sunxi_cedrus_buffer *vb2_to_cedrus_buffer(const struct vb2_buffer *p) > +{ > + return vb2_v4l2_to_cedrus_buffer(to_vb2_v4l2_buffer(p)); > +} > + > struct sunxi_cedrus_dev { > struct v4l2_device v4l2_dev; > struct video_device vfd; > diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c > index 5783bd985855..fc688a5c1ea3 100644 > --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c > +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_hw.c > @@ -108,8 +108,8 @@ static irqreturn_t sunxi_cedrus_ve_irq(int irq, void *dev_id) > return IRQ_HANDLED; > } > > - src_buffer = container_of(src_vb, struct sunxi_cedrus_buffer, vb); > - dst_buffer = container_of(dst_vb, struct sunxi_cedrus_buffer, vb); > + src_buffer = vb2_v4l2_to_cedrus_buffer(src_vb); > + dst_buffer = vb2_v4l2_to_cedrus_buffer(dst_vb); > > /* First bit of MPEG_STATUS indicates success. */ > if (ctx->job_abort || !(status & 0x01)) -- Paul Kocialkowski, Bootlin (formerly Free Electrons) Embedded Linux and kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: This is a digitally signed message part URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180621/33933c40/attachment.sig>
next prev parent reply other threads:[~2018-06-21 9:03 UTC|newest] Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-13 14:07 [PATCH 0/9] media: cedrus: Add H264 decoding support Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-13 14:07 ` [PATCH 1/9] CHROMIUM: v4l: Add H264 low-level decoder API compound controls Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-15 11:59 ` Hans Verkuil 2018-06-15 11:59 ` Hans Verkuil 2018-06-15 13:01 ` Guenter Roeck 2018-06-15 13:01 ` Guenter Roeck 2018-07-12 16:38 ` Maxime Ripard 2018-07-12 16:38 ` Maxime Ripard 2018-07-12 16:47 ` Andrew Lunn 2018-07-12 16:47 ` Andrew Lunn 2018-06-21 8:58 ` Paul Kocialkowski 2018-06-21 8:58 ` Paul Kocialkowski 2018-08-21 16:58 ` Ezequiel Garcia 2018-08-21 16:58 ` Ezequiel Garcia 2018-08-21 17:07 ` Nicolas Dufresne 2018-08-21 17:07 ` Nicolas Dufresne 2018-08-22 13:07 ` Paul Kocialkowski 2018-08-22 13:07 ` Paul Kocialkowski 2018-08-22 13:38 ` Tomasz Figa 2018-08-22 13:38 ` Tomasz Figa 2018-08-22 13:52 ` Nicolas Dufresne 2018-08-22 13:52 ` Nicolas Dufresne 2018-08-22 14:45 ` Paul Kocialkowski 2018-08-22 14:45 ` Paul Kocialkowski 2018-08-28 8:11 ` Tomasz Figa 2018-08-28 8:11 ` Tomasz Figa 2018-09-07 7:54 ` Tomasz Figa 2018-09-07 7:54 ` Tomasz Figa 2018-08-22 9:15 ` Maxime Ripard 2018-08-22 9:15 ` Maxime Ripard 2018-08-22 9:54 ` Tomasz Figa 2018-08-22 9:54 ` Tomasz Figa 2018-08-22 13:03 ` Paul Kocialkowski 2018-08-22 13:03 ` Paul Kocialkowski 2018-08-22 13:24 ` Tomasz Figa 2018-08-22 13:24 ` Tomasz Figa 2018-08-22 14:03 ` Nicolas Dufresne 2018-08-22 14:03 ` Nicolas Dufresne 2018-08-22 14:30 ` Paul Kocialkowski 2018-08-22 14:30 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 2/9] media: cedrus: Add wrappers around container_of for our buffers Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 9:03 ` Paul Kocialkowski [this message] 2018-06-21 9:03 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 3/9] media: cedrus: Add a macro to check for the validity of a control Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 9:13 ` Paul Kocialkowski 2018-06-21 9:13 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 4/9] media: cedrus: make engine type more generic Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 9:33 ` Paul Kocialkowski 2018-06-21 9:33 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 5/9] media: cedrus: Remove MPEG1 support Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-13 14:07 ` [PATCH 6/9] media: cedrus: Add ops structure Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 9:49 ` Paul Kocialkowski 2018-06-21 9:49 ` Paul Kocialkowski 2018-06-25 13:29 ` Maxime Ripard 2018-06-25 13:29 ` Maxime Ripard 2018-06-25 13:48 ` Paul Kocialkowski 2018-06-25 13:48 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 7/9] media: cedrus: Move IRQ maintainance to cedrus_dec_ops Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 15:35 ` Paul Kocialkowski 2018-06-21 15:35 ` Paul Kocialkowski 2018-06-25 14:18 ` Paul Kocialkowski 2018-06-25 14:18 ` Paul Kocialkowski 2018-06-25 16:15 ` Maxime Ripard 2018-06-25 16:15 ` Maxime Ripard 2018-06-25 15:38 ` Paul Kocialkowski 2018-06-25 15:38 ` Paul Kocialkowski 2018-06-25 15:49 ` Paul Kocialkowski 2018-06-25 15:49 ` Paul Kocialkowski 2018-06-25 19:01 ` Maxime Ripard 2018-06-25 19:01 ` Maxime Ripard 2018-06-27 17:58 ` Maxime Ripard 2018-06-27 17:58 ` Maxime Ripard 2018-06-13 14:07 ` [PATCH 8/9] media: cedrus: Add start and stop decoder operations Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-06-21 15:38 ` Paul Kocialkowski 2018-06-21 15:38 ` Paul Kocialkowski 2018-06-25 13:32 ` Maxime Ripard 2018-06-25 13:32 ` Maxime Ripard 2018-06-25 13:42 ` Paul Kocialkowski 2018-06-25 13:42 ` Paul Kocialkowski 2018-06-13 14:07 ` [PATCH 9/9] media: cedrus: Add H264 decoding support Maxime Ripard 2018-06-13 14:07 ` Maxime Ripard 2018-07-27 13:56 ` Paul Kocialkowski 2018-07-27 13:56 ` Paul Kocialkowski 2018-07-27 14:01 ` Chen-Yu Tsai 2018-07-27 14:01 ` Chen-Yu Tsai 2018-07-27 14:03 ` Paul Kocialkowski 2018-07-27 14:03 ` Paul Kocialkowski 2018-07-30 12:54 ` Paul Kocialkowski 2018-07-30 12:54 ` Paul Kocialkowski 2018-06-14 13:00 ` [PATCH 0/9] " Tomasz Figa 2018-06-14 13:00 ` Tomasz Figa 2018-06-14 16:37 ` Maxime Ripard 2018-06-14 16:37 ` Maxime Ripard
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=d19e2594f11963b218d7f09b4a50e9df36330dbe.camel@bootlin.com \ --to=paul.kocialkowski@bootlin.com \ --cc=acourbot@chromium.org \ --cc=hans.verkuil@cisco.com \ --cc=jenskuske@gmail.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-sunxi@googlegroups.com \ --cc=maxime.ripard@bootlin.com \ --cc=nicolas.dufresne@collabora.com \ --cc=posciak@chromium.org \ --cc=sakari.ailus@linux.intel.com \ --cc=tfiga@chromium.org \ --cc=thomas.petazzoni@bootlin.com \ --cc=wens@csie.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.