From: Zixin Wang <w1355457260@gmail.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Hans Verkuil <hverkuil+cisco@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Biren Pandya <birenpandya@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Zixin Wang <w1355457260@gmail.com>
Subject: [PATCH v2] media: media-entity: make media_entity_cleanup() a no-op macro without MC
Date: Fri, 13 Nov 2026 10:18:45 +0800 [thread overview]
Message-ID: <20261113021845.1697485-1-w1355457260@gmail.com> (raw)
Without CONFIG_MEDIA_CONTROLLER, struct v4l2_subdev has no entity member.
Calls such as media_entity_cleanup(&sd->entity) therefore fail to
compile even though the function does nothing:
drivers/media/i2c/cx25840/cx25840-core.c:3964:41: error:
'struct v4l2_subdev' has no member named 'entity'
Turn media_entity_cleanup() into a macro that discards its argument when
CONFIG_MEDIA_CONTROLLER is disabled. This fixes the cx25840 build and
any other caller passing a member that only exists with the media
controller API enabled.
Suggested-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Fixes: 634be628b5cc ("media: i2c: cx25840-core: Add missing media_entity_cleanup()")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=222245
Signed-off-by: Zixin Wang <w1355457260@gmail.com>
---
Notes:
Hi Sakari, thanks for the review and the suggestion.
v2:
- Make media_entity_cleanup() a no-op macro without
CONFIG_MEDIA_CONTROLLER instead of guarding each caller (suggested by
Sakari).
AI assistance: the change and this changelog were drafted with the Qoder
coding assistant; the sender reviewed it and ran the builds with
CONFIG_MEDIA_CONTROLLER=n and =y.
include/media/media-entity.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index fa393e840669..400e08598dd6 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -729,9 +729,13 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
* zeroed but that has not been initialized with media_entity_pads_init() is
* valid and is a no-op.
*/
+#ifdef CONFIG_MEDIA_CONTROLLER
static inline void media_entity_cleanup(struct media_entity *entity)
{
}
+#else
+#define media_entity_cleanup(...) do { } while (0)
+#endif
/**
* media_get_pad_index() - retrieves a pad index from an entity
--
2.56.1
reply other threads:[~2026-11-13 2:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261113021845.1697485-1-w1355457260@gmail.com \
--to=w1355457260@gmail.com \
--cc=birenpandya@gmail.com \
--cc=hverkuil+cisco@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@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
all inboxes | Powered by JetHome®