From: Cezary Rojewski <cezary.rojewski@intel.com>
To: broonie@kernel.org
Cc: tiwai@suse.com, perex@perex.cz, amade@asmblr.net,
linux-sound@vger.kernel.org, andriy.shevchenko@linux.intel.com,
Cezary Rojewski <cezary.rojewski@intel.com>
Subject: [PATCH 4/8] ASoC: Intel: catpt: Rename module header struct
Date: Wed, 29 Jul 2026 13:00:53 +0200 [thread overview]
Message-ID: <20260729110057.342447-5-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20260729110057.342447-1-cezary.rojewski@intel.com>
Goal is to match the name of its equivalent on the firmware side.
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
sound/soc/intel/catpt/loader.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/intel/catpt/loader.c b/sound/soc/intel/catpt/loader.c
index 775781489ded..06c8b043e292 100644
--- a/sound/soc/intel/catpt/loader.c
+++ b/sound/soc/intel/catpt/loader.c
@@ -26,7 +26,7 @@ struct catpt_fw_hdr {
u32 reserved[4];
} __packed;
-struct catpt_fw_mod_hdr {
+struct catpt_fw_module_hdr {
char signature[FW_SIGNATURE_SIZE];
u32 mod_size;
u32 blocks;
@@ -357,7 +357,7 @@ static int catpt_load_block(struct catpt_dev *cdev,
static int catpt_restore_basefw(struct catpt_dev *cdev,
struct dma_chan *chan, dma_addr_t paddr,
- struct catpt_fw_mod_hdr *basefw)
+ struct catpt_fw_module_hdr *basefw)
{
u32 offset = sizeof(*basefw);
int ret, i;
@@ -400,7 +400,7 @@ static int catpt_restore_basefw(struct catpt_dev *cdev,
static int catpt_restore_module(struct catpt_dev *cdev,
struct dma_chan *chan, dma_addr_t paddr,
- struct catpt_fw_mod_hdr *mod)
+ struct catpt_fw_module_hdr *mod)
{
u32 offset = sizeof(*mod);
int i;
@@ -441,7 +441,7 @@ static int catpt_restore_module(struct catpt_dev *cdev,
static int catpt_load_module(struct catpt_dev *cdev,
struct dma_chan *chan, dma_addr_t paddr,
- struct catpt_fw_mod_hdr *mod)
+ struct catpt_fw_module_hdr *mod)
{
struct catpt_module_type *type;
u32 offset = sizeof(*mod);
@@ -497,10 +497,10 @@ static int catpt_restore_firmware(struct catpt_dev *cdev,
fw, sizeof(*fw), false);
for (i = 0; i < fw->modules; i++) {
- struct catpt_fw_mod_hdr *mod;
+ struct catpt_fw_module_hdr *mod;
int ret;
- mod = (struct catpt_fw_mod_hdr *)((u8 *)fw + offset);
+ mod = (struct catpt_fw_module_hdr *)((u8 *)fw + offset);
if (strncmp(fw->signature, mod->signature,
FW_SIGNATURE_SIZE)) {
dev_err(cdev->dev, "module signature mismatch\n");
@@ -543,10 +543,10 @@ static int catpt_load_firmware(struct catpt_dev *cdev,
fw, sizeof(*fw), false);
for (i = 0; i < fw->modules; i++) {
- struct catpt_fw_mod_hdr *mod;
+ struct catpt_fw_module_hdr *mod;
int ret;
- mod = (struct catpt_fw_mod_hdr *)((u8 *)fw + offset);
+ mod = (struct catpt_fw_module_hdr *)((u8 *)fw + offset);
if (strncmp(fw->signature, mod->signature,
FW_SIGNATURE_SIZE)) {
dev_err(cdev->dev, "module signature mismatch\n");
--
2.34.1
next prev parent reply other threads:[~2026-07-29 10:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-29 11:00 [PATCH 0/8] ASoC: Intel: catpt: Code cleanup and renames Cezary Rojewski
2026-07-29 11:00 ` [PATCH 1/8] ASoC: Intel: catpt: Wrap the store firmware-context procedure Cezary Rojewski
2026-07-29 11:00 ` [PATCH 2/8] ASoC: Intel: catpt: Drop redundant else-if Cezary Rojewski
2026-07-29 11:00 ` [PATCH 3/8] ASoC: Intel: catpt: Drop redundant signature argument Cezary Rojewski
2026-07-29 11:00 ` Cezary Rojewski [this message]
2026-07-29 11:00 ` [PATCH 5/8] ASoC: Intel: catpt: Rename firmware loading functions Cezary Rojewski
2026-07-29 11:00 ` [PATCH 6/8] ASoC: Intel: catpt: Streamline wording of offset variables Cezary Rojewski
2026-07-29 11:00 ` [PATCH 7/8] ASoC: Intel: catpt: Streamline runtime-variables naming Cezary Rojewski
2026-07-29 11:00 ` [PATCH 8/8] ASoC: Intel: catpt: Streamline control-variables naming Cezary Rojewski
2026-07-30 21:31 ` [PATCH 0/8] ASoC: Intel: catpt: Code cleanup and renames Mark Brown
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=20260729110057.342447-5-cezary.rojewski@intel.com \
--to=cezary.rojewski@intel.com \
--cc=amade@asmblr.net \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.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