This patchset includes change happened in greybus driver in three
different files two of them patch one and three related to
checkpatch issue and in second patch convert two
`container_of` macros into inline functions.
Menna Mahmoud (3):
staging: greybus: remove unnecessary blank line
staging: greybus: use inline function for macros
staging: greybus: remove unnecessary blank line
drivers/staging/greybus/gbphy.h | 10 ++++++++--
drivers/staging/greybus/greybus_authentication.h | 1 -
drivers/staging/greybus/pwm.c | 1 -
3 files changed, 8 insertions(+), 4 deletions(-)
--
2.34.1
In file drivers/staging/greybus/arche-platform.c,
- Length of line 181 exceeds 100 columns, fix by removing tabs from the
line.
- If condition and spin_unlock_...() call is split into two lines, join
them to form a single line.
Signed-off-by: Khadija Kamran <kamrankhadijadj(a)gmail.com>
---
Changes in v2:
- Change the subject and log message
- Merge if condition and spin_unlock...() from two lines to one
drivers/staging/greybus/arche-platform.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
index fcbd5f71eff2..00ed5dfd7915 100644
--- a/drivers/staging/greybus/arche-platform.c
+++ b/drivers/staging/greybus/arche-platform.c
@@ -176,12 +176,10 @@ static irqreturn_t arche_platform_wd_irq(int irq, void *devid)
* Check we are not in middle of irq thread
* already
*/
- if (arche_pdata->wake_detect_state !=
- WD_STATE_COLDBOOT_START) {
+ if (arche_pdata->wake_detect_state != WD_STATE_COLDBOOT_START) {
arche_platform_set_wake_detect_state(arche_pdata,
- WD_STATE_COLDBOOT_TRIG);
- spin_unlock_irqrestore(&arche_pdata->wake_lock,
- flags);
+ WD_STATE_COLDBOOT_TRIG);
+ spin_unlock_irqrestore(&arche_pdata->wake_lock, flags);
return IRQ_WAKE_THREAD;
}
}
--
2.34.1
The gb_audio_gb_get_topology function at the top of the file
needs to be split per a TODO comment above the function. It
is necessary to refactor the code to pull out a method
that has fewer parameters to improve readability. A
prototype for the new function is now in the relevant header,
and the simpler function calls replace the old ones.
Signed-off-by: Mark Thomas Heim <questioneight(a)gmail.com>
---
drivers/staging/greybus/audio_codec.h | 2 ++
drivers/staging/greybus/audio_gb.c | 21 +++++++++++----------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h
index ce15e800e607..a2e8361952b8 100644
--- a/drivers/staging/greybus/audio_codec.h
+++ b/drivers/staging/greybus/audio_codec.h
@@ -177,6 +177,8 @@ int gbaudio_register_module(struct gbaudio_module_info *module);
void gbaudio_unregister_module(struct gbaudio_module_info *module);
/* protocol related */
+int fetch_gb_audio_data(struct gb_connection *connection, int type,
+ void *response, int response_size);
int gb_audio_gb_get_topology(struct gb_connection *connection,
struct gb_audio_topology **topology);
int gb_audio_gb_get_control(struct gb_connection *connection,
diff --git a/drivers/staging/greybus/audio_gb.c b/drivers/staging/greybus/audio_gb.c
index 9d8994fdb41a..3c924d13f0e7 100644
--- a/drivers/staging/greybus/audio_gb.c
+++ b/drivers/staging/greybus/audio_gb.c
@@ -8,7 +8,13 @@
#include <linux/greybus.h>
#include "audio_codec.h"
-/* TODO: Split into separate calls */
+int fetch_gb_audio_data(struct gb_connection *connection,
+ int type, void *response, int response_size)
+{
+ return gb_operation_sync(connection, type, NULL, 0,
+ response, response_size);
+}
+
int gb_audio_gb_get_topology(struct gb_connection *connection,
struct gb_audio_topology **topology)
{
@@ -17,28 +23,23 @@ int gb_audio_gb_get_topology(struct gb_connection *connection,
u16 size;
int ret;
- ret = gb_operation_sync(connection, GB_AUDIO_TYPE_GET_TOPOLOGY_SIZE,
- NULL, 0, &size_resp, sizeof(size_resp));
+ ret = fetch_gb_audio_data(connection, GB_AUDIO_TYPE_GET_TOPOLOGY_SIZE,
+ &size_resp, sizeof(size_resp));
if (ret)
return ret;
-
size = le16_to_cpu(size_resp.size);
if (size < sizeof(*topo))
return -ENODATA;
-
topo = kzalloc(size, GFP_KERNEL);
if (!topo)
return -ENOMEM;
-
- ret = gb_operation_sync(connection, GB_AUDIO_TYPE_GET_TOPOLOGY, NULL, 0,
- topo, size);
+ ret = fetch_gb_audio_data(connection, GB_AUDIO_TYPE_GET_TOPOLOGY,
+ topo, size);
if (ret) {
kfree(topo);
return ret;
}
-
*topology = topo;
-
return 0;
}
EXPORT_SYMBOL_GPL(gb_audio_gb_get_topology);
--
2.25.1
" ERROR: Macros with multiple statements should be enclosed in a do -
while loop"
Reported by checkpath.
do loop with the conditional expression set to a constant
value of zero (0).This creates a loop that
will execute exactly one time.This is a coding idiom that
allows a multi-line macro to be used anywhere
that a single statement can be used.
So, enclose `gb_loopback_stats_attrs` macro in do - while (0) to
fix checkpath error
Signed-off-by: Menna Mahmoud <eng.mennamahmoud.mm(a)gmail.com>
---
drivers/staging/greybus/loopback.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c
index 1a61fce98056..e86d50638cb5 100644
--- a/drivers/staging/greybus/loopback.c
+++ b/drivers/staging/greybus/loopback.c
@@ -162,10 +162,12 @@ static ssize_t name##_avg_show(struct device *dev, \
} \
static DEVICE_ATTR_RO(name##_avg)
-#define gb_loopback_stats_attrs(field) \
- gb_loopback_ro_stats_attr(field, min, u); \
- gb_loopback_ro_stats_attr(field, max, u); \
- gb_loopback_ro_avg_attr(field)
+#define gb_loopback_stats_attrs(field) \
+ do { \
+ gb_loopback_ro_stats_attr(field, min, u); \
+ gb_loopback_ro_stats_attr(field, max, u); \
+ gb_loopback_ro_avg_attr(field); \
+ } while (0)
#define gb_loopback_attr(field, type) \
static ssize_t field##_show(struct device *dev, \
--
2.34.1