From: "Adrian Barnaś" <abarnas@google.com>
To: Hans de Goede <hansg@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Andy Shevchenko <andy@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dan Carpenter <dan.carpenter@linaro.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-staging@lists.linux.dev
Cc: "Adrian Barnaś" <abarnas@google.com>
Subject: [PATCH v2 2/3] staging: media: atomisp: Whitespaces cleanup in vmem.c
Date: Tue, 2 Sep 2025 07:18:46 +0000 [thread overview]
Message-ID: <20250902071847.2330409-3-abarnas@google.com> (raw)
In-Reply-To: <20250902071847.2330409-1-abarnas@google.com>
Whitespaces cleanup to conform with kernel style and improve readability.
Signed-off-by: Adrian Barnaś <abarnas@google.com>
---
.../pci/hive_isp_css_common/host/vmem.c | 83 +++++--------------
1 file changed, 23 insertions(+), 60 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
index fd640e100591..aa67638a09a5 100644
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
@@ -13,7 +13,6 @@
#endif
#include "assert_support.h"
-
/* Copied from SDK: sim_semantics.c */
/* subword bits move like this: MSB[____xxxx____]LSB -> MSB[00000000xxxx]LSB */
@@ -35,13 +34,8 @@ inv_subword(unsigned long long w, unsigned int start, unsigned int end)
#define move_upper_bits(target, target_bit, src, src_bit) move_subword(target, target_bit, src, src_bit, uedge_bits)
#define move_word(target, target_bit, src) move_subword(target, target_bit, src, 0, uedge_bits)
-static void
-move_subword(
- unsigned long long *target,
- unsigned int target_bit,
- unsigned long long src,
- unsigned int src_start,
- unsigned int src_end)
+static void move_subword(unsigned long long *target, unsigned int target_bit,
+ unsigned long long src, unsigned int src_start, unsigned int src_end)
{
unsigned int start_elem = target_bit / uedge_bits;
unsigned int start_bit = target_bit % uedge_bits;
@@ -51,7 +45,8 @@ move_subword(
if (subword_width + start_bit > uedge_bits) { /* overlap */
unsigned long long old_val1;
- unsigned long long old_val0 = inv_subword(target[start_elem], start_bit, uedge_bits);
+ unsigned long long old_val0 = inv_subword(target[start_elem],
+ start_bit, uedge_bits);
target[start_elem] = old_val0 | (src_subword << start_bit);
old_val1 = inv_subword(target[start_elem + 1], 0,
@@ -59,18 +54,14 @@ move_subword(
target[start_elem + 1] = old_val1 | (src_subword >> (uedge_bits - start_bit));
} else {
unsigned long long old_val = inv_subword(target[start_elem], start_bit,
- start_bit + subword_width);
+ start_bit + subword_width);
target[start_elem] = old_val | (src_subword << start_bit);
}
}
-static void
-hive_sim_wide_unpack(
- unsigned long long *vector,
- unsigned long long *elem,
- hive_uint elem_bits,
- hive_uint index)
+static void hive_sim_wide_unpack(unsigned long long *vector, unsigned long long *elem,
+ hive_uint elem_bits, hive_uint index)
{
/* pointers into wide_type: */
unsigned int start_elem = (elem_bits * index) / uedge_bits;
@@ -99,12 +90,8 @@ hive_sim_wide_unpack(
}
}
-static void
-hive_sim_wide_pack(
- unsigned long long *vector,
- unsigned long long *elem,
- hive_uint elem_bits,
- hive_uint index)
+static void hive_sim_wide_pack(unsigned long long *vector, unsigned long long *elem,
+ hive_uint elem_bits, hive_uint index)
{
/* pointers into wide_type: */
unsigned int start_elem = (elem_bits * index) / uedge_bits;
@@ -128,10 +115,7 @@ hive_sim_wide_pack(
}
}
-static void load_vector(
- const isp_ID_t ID,
- t_vmem_elem *to,
- const t_vmem_elem *from)
+static void load_vector(const isp_ID_t ID, t_vmem_elem *to, const t_vmem_elem *from)
{
unsigned int i;
unsigned long long *data;
@@ -154,10 +138,7 @@ static void load_vector(
udelay(1); /* Spend at least 1 cycles per vector */
}
-static void store_vector(
- const isp_ID_t ID,
- t_vmem_elem *to,
- const t_vmem_elem *from)
+static void store_vector(const isp_ID_t ID, t_vmem_elem *to, const t_vmem_elem *from)
{
unsigned int i;
unsigned int size = sizeof(short) * ISP_NWAY;
@@ -166,9 +147,9 @@ static void store_vector(
//load_vector (&v[1][0], &to[ISP_NWAY]); /* Fetch the next vector, since it will be overwritten. */
unsigned long long *data = (unsigned long long *)v;
- for (i = 0; i < ISP_NWAY; i++) {
+ for (i = 0; i < ISP_NWAY; i++)
hive_sim_wide_pack(data, (unsigned long long *)&from[i], ISP_VEC_ELEMBITS, i);
- }
+
assert(ISP_BAMEM_BASE[ID] != (hrt_address) - 1);
#if !defined(HRT_MEMORY_ACCESS)
ia_css_device_store(ISP_BAMEM_BASE[ID] + (unsigned long)to, &v, size);
@@ -179,11 +160,8 @@ static void store_vector(
udelay(1); /* Spend at least 1 cycles per vector */
}
-void isp_vmem_load(
- const isp_ID_t ID,
- const t_vmem_elem *from,
- t_vmem_elem *to,
- unsigned int elems) /* In t_vmem_elem */
+void isp_vmem_load(const isp_ID_t ID, const t_vmem_elem *from, t_vmem_elem *to,
+ unsigned int elems) /* In t_vmem_elem */
{
unsigned int c;
const t_vmem_elem *vp = from;
@@ -197,11 +175,8 @@ void isp_vmem_load(
}
}
-void isp_vmem_store(
- const isp_ID_t ID,
- t_vmem_elem *to,
- const t_vmem_elem *from,
- unsigned int elems) /* In t_vmem_elem */
+void isp_vmem_store(const isp_ID_t ID, t_vmem_elem *to, const t_vmem_elem *from,
+ unsigned int elems) /* In t_vmem_elem */
{
unsigned int c;
t_vmem_elem *vp = to;
@@ -215,15 +190,9 @@ void isp_vmem_store(
}
}
-void isp_vmem_2d_load(
- const isp_ID_t ID,
- const t_vmem_elem *from,
- t_vmem_elem *to,
- unsigned int height,
- unsigned int width,
- unsigned int stride_to, /* In t_vmem_elem */
-
- unsigned stride_from /* In t_vmem_elem */)
+void isp_vmem_2d_load(const isp_ID_t ID, const t_vmem_elem *from, t_vmem_elem *to,
+ unsigned int height, unsigned int width,
+ unsigned int stride_to, unsigned int stride_from) /* In t_vmem_elem */
{
unsigned int h;
@@ -244,15 +213,9 @@ void isp_vmem_2d_load(
}
}
-void isp_vmem_2d_store(
- const isp_ID_t ID,
- t_vmem_elem *to,
- const t_vmem_elem *from,
- unsigned int height,
- unsigned int width,
- unsigned int stride_to, /* In t_vmem_elem */
-
- unsigned stride_from /* In t_vmem_elem */)
+void isp_vmem_2d_store(const isp_ID_t ID, t_vmem_elem *to, const t_vmem_elem *from,
+ unsigned int height, unsigned int width,
+ unsigned int stride_to, unsigned int stride_from) /* In t_vmem_elem */
{
unsigned int h;
--
2.51.0.318.gd7df087d1a-goog
next prev parent reply other threads:[~2025-09-02 7:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-02 7:18 [PATCH v2 0/3] staging: media: atomisp: Style fixes for vmem.c Adrian Barnaś
2025-09-02 7:18 ` [PATCH v2 1/3] staging: media: atomisp: Remove typedefs for basic types in vmem.c Adrian Barnaś
2025-09-02 7:18 ` Adrian Barnaś [this message]
2025-09-02 7:18 ` [PATCH v2 3/3] staging: media: atomisp: Remove trailing comments Adrian Barnaś
2025-09-02 15:31 ` Andy Shevchenko
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=20250902071847.2330409-3-abarnas@google.com \
--to=abarnas@google.com \
--cc=andy@kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=hansg@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--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