codestyle issue fixed drivers/staging/vc04_services

PATCH In review Mikhail Shvetsov 3 participants 10 messages Dec 7, 2017 – Dec 20, 2017

Subsystems (2)

Staging Broadcom BCM2711/BCM2835 Arm architecture

lore

Share & tools

lore

Mikhail Shvetsov

author

2017-12-07 07:47 UTC #0 lore raw

PATCH 1/1 codestyle issue fixed drivers/staging/vc04_services

From: Mike <[email protected]>

Signed-off-by Mike <[email protected]>

---
 .../interface/vchiq_arm/vchiq_kern_lib.c           | 64 ++++++++++++----------
 1 file changed, 35 insertions(+), 29 deletions(-)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +35 ~~-29~~

index 34f746db19cd..d21bb154f78c 100644
@@ -65,10 +65,10 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 	unsigned int size, VCHIQ_BULK_DIR_T dir);
 
 /****************************************************************************
-*
-*   vchiq_initialise
-*
-***************************************************************************/
+ *
+ *   vchiq_initialise
+ *
+ ***************************************************************************/
 #define VCHIQ_INIT_RETRIES 10
 VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 {

@@ -80,7 +80,9 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 	vchiq_log_trace(vchiq_core_log_level, "%s called", __func__);
 
 	/* VideoCore may not be ready due to boot up timing.
-	   It may never be ready if kernel and firmware are mismatched, so don't block forever. */
+	 * It may never be ready if kernel and firmware are mismatched, so don't
+	 * block forever.
+	 */
 	for (i = 0; i < VCHIQ_INIT_RETRIES; i++) {
 		state = vchiq_get_state();
 		if (state)

@@ -93,7 +95,8 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 		goto failed;
 	} else if (i > 0) {
 		vchiq_log_warning(vchiq_core_log_level,
-			"%s: videocore initialized after %d retries\n", __func__, i);
+			"%s: videocore initialized after %d retries\n",
+			__func__, i);
 	}
 
 	instance = kzalloc(sizeof(*instance), GFP_KERNEL);

@@ -121,10 +124,10 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 EXPORT_SYMBOL(vchiq_initialise);
 
 /****************************************************************************
-*
-*   vchiq_shutdown
-*
-***************************************************************************/
+ *
+ *   vchiq_shutdown
+ *
+ ***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
 {

@@ -169,10 +172,10 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
 EXPORT_SYMBOL(vchiq_shutdown);
 
 /****************************************************************************
-*
-*   vchiq_is_connected
-*
-***************************************************************************/
+ *
+ *   vchiq_is_connected
+ *
+ ***************************************************************************/
 
 static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
 {

@@ -180,10 +183,10 @@ static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
 }
 
 /****************************************************************************
-*
-*   vchiq_connect
-*
-***************************************************************************/
+ *
+ *   vchiq_connect
+ *
+ ***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
 {

@@ -215,10 +218,10 @@ VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
 EXPORT_SYMBOL(vchiq_connect);
 
 /****************************************************************************
-*
-*   vchiq_add_service
-*
-***************************************************************************/
+ *
+ *   vchiq_add_service
+ *
+ ***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_add_service(
 	VCHIQ_INSTANCE_T              instance,

@@ -260,10 +263,10 @@ VCHIQ_STATUS_T vchiq_add_service(
 EXPORT_SYMBOL(vchiq_add_service);
 
 /****************************************************************************
-*
-*   vchiq_open_service
-*
-***************************************************************************/
+ *
+ *   vchiq_open_service
+ *
+ ***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_open_service(
 	VCHIQ_INSTANCE_T              instance,

@@ -414,8 +417,9 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 			if ((bulk->data != data) ||
 				(bulk->size != size)) {
 				/* This is not a retry of the previous one.
-				** Cancel the signal when the transfer
-				** completes. */
+				 * Cancel the signal when the transfer
+				 * completes.
+				 */
 				spin_lock(&bulk_waiter_spinlock);
 				bulk->userdata = NULL;
 				spin_unlock(&bulk_waiter_spinlock);

@@ -441,7 +445,9 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 
 		if (bulk) {
 			/* Cancel the signal when the transfer
-			 ** completes. */
+			 *
+			 * completes.
+			 */
 			spin_lock(&bulk_waiter_spinlock);
 			bulk->userdata = NULL;
 			spin_unlock(&bulk_waiter_spinlock);

Signature · 1 line

2.13.6 (Apple Git-96)

Stefan Wahren

2017-12-07 08:14 UTC #1 lore raw

Hello Mikhail,

Am 07.12.2017 um 08:47 schrieb Mikhail Shvetsov:

Quoted 1 line

From: Mike <[email protected]>

please provide your full name and a changelog. Also the subject should start with something like "staging: vchiq_arm:".

Quoted 12 lines

Signed-off-by Mike <[email protected]>

---
 .../interface/vchiq_arm/vchiq_kern_lib.c           | 64 ++++++++++++----------
 1 file changed, 35 insertions(+), 29 deletions(-)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +0 -0

index 34f746db19cd..d21bb154f78c 100644
@@ -65,10 +65,10 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 	unsigned int size, VCHIQ_BULK_DIR_T dir);

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data, · line 71

Quoted 10 lines

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +4 -4

 
 /****************************************************************************
-*
-*   vchiq_initialise
-*
-***************************************************************************/
+ *
+ *   vchiq_initialise
+ *
+ ***************************************************************************/

Instead of fixing the comment style, i prefer to drop this kind of useless comments in a separate patch.

Quoted 15 lines

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +3 -1

 #define VCHIQ_INIT_RETRIES 10
 VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 {

@@ -80,7 +80,9 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 	vchiq_log_trace(vchiq_core_log_level, "%s called", __func__);
 
 	/* VideoCore may not be ready due to boot up timing.
-	   It may never be ready if kernel and firmware are mismatched, so don't block forever. */
+	 * It may never be ready if kernel and firmware are mismatched, so don't
+	 * block forever.
+	 */
 	for (i = 0; i < VCHIQ_INIT_RETRIES; i++) {
 		state = vchiq_get_state();
 		if (state)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out) · line 99

Quoted 6 lines

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +2 -1

@@ -93,7 +95,8 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 		goto failed;
 	} else if (i > 0) {
 		vchiq_log_warning(vchiq_core_log_level,
-			"%s: videocore initialized after %d retries\n", __func__, i);
+			"%s: videocore initialized after %d retries\n",
+			__func__, i);

This isn't a comment, so it should be a separate patch.

Quoted 91 lines

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +23 ~~-22~~

 	}
 
 	instance = kzalloc(sizeof(*instance), GFP_KERNEL);

@@ -121,10 +124,10 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 EXPORT_SYMBOL(vchiq_initialise);
 
 /****************************************************************************
-*
-*   vchiq_shutdown
-*
-***************************************************************************/
+ *
+ *   vchiq_shutdown
+ *
+ ***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
 {

@@ -169,10 +172,10 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
 EXPORT_SYMBOL(vchiq_shutdown);
 
 /****************************************************************************
-*
-*   vchiq_is_connected
-*
-***************************************************************************/
+ *
+ *   vchiq_is_connected
+ *
+ ***************************************************************************/
 
 static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
 {

@@ -180,10 +183,10 @@ static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
 }
 
 /****************************************************************************
-*
-*   vchiq_connect
-*
-***************************************************************************/
+ *
+ *   vchiq_connect
+ *
+ ***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
 {

@@ -215,10 +218,10 @@ VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
 EXPORT_SYMBOL(vchiq_connect);
 
 /****************************************************************************
-*
-*   vchiq_add_service
-*
-***************************************************************************/
+ *
+ *   vchiq_add_service
+ *
+ ***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_add_service(
 	VCHIQ_INSTANCE_T              instance,

@@ -260,10 +263,10 @@ VCHIQ_STATUS_T vchiq_add_service(
 EXPORT_SYMBOL(vchiq_add_service);
 
 /****************************************************************************
-*
-*   vchiq_open_service
-*
-***************************************************************************/
+ *
+ *   vchiq_open_service
+ *
+ ***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_open_service(
 	VCHIQ_INSTANCE_T              instance,

@@ -414,8 +417,9 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 			if ((bulk->data != data) ||
 				(bulk->size != size)) {
 				/* This is not a retry of the previous one.
-				** Cancel the signal when the transfer
-				** completes. */
+				 * Cancel the signal when the transfer
+				 * completes.
+				 */
 				spin_lock(&bulk_waiter_spinlock);
 				bulk->userdata = NULL;
 				spin_unlock(&bulk_waiter_spinlock);

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data, · line 448

Quoted 5 lines

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +1 -1

@@ -441,7 +445,9 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 
 		if (bulk) {
 			/* Cancel the signal when the transfer
-			 ** completes. */
+			 *

Please avoid this empty line.

Thanks

Quoted 5 lines

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +2 -0

+			 * completes.
+			 */
 			spin_lock(&bulk_waiter_spinlock);
 			bulk->userdata = NULL;
 			spin_unlock(&bulk_waiter_spinlock);

Mikhail Shvetsov

author

2017-12-14 20:40 UTC #2 lore raw

cover staging: vchiq_arm: code style fixing

Mikhail Shvetsov (3):
Remove useless comments
Fixing code style of comments
Fixing code lines over 80 characters

 .../interface/vchiq_arm/vchiq_kern_lib.c           | 50 +++++-----------------
 1 file changed, 11 insertions(+), 39 deletions(-)

Signature · 1 line

2.11.0

Mikhail Shvetsov

author

2017-12-14 20:40 UTC #3 lore raw

PATCH 1/3 staging: vchiq_arm: Remove useless comments

Signed-off-by Mikhail Shvetsov <[email protected]>

---
 .../interface/vchiq_arm/vchiq_kern_lib.c           | 35 +---------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +1 ~~-34~~

index 34f746db19cd..4a40b9b31a5a 100644
@@ -31,7 +31,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* ---- Include Files ---------------------------------------------------- */
 
 #include <linux/kernel.h>
 #include <linux/module.h>

@@ -41,9 +40,6 @@
 #include "vchiq_arm.h"
 #include "vchiq_killable.h"
 
-/* ---- Public Variables ------------------------------------------------- */
-
-/* ---- Private Constants and Types -------------------------------------- */
 
 struct bulk_waiter_node {
 	struct bulk_waiter bulk_waiter;

@@ -64,11 +60,7 @@ static VCHIQ_STATUS_T
 vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 	unsigned int size, VCHIQ_BULK_DIR_T dir);
 
-/****************************************************************************
-*
-*   vchiq_initialise
-*
-***************************************************************************/
+
 #define VCHIQ_INIT_RETRIES 10
 VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 {

@@ -120,11 +112,6 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 }
 EXPORT_SYMBOL(vchiq_initialise);
 
-/****************************************************************************
-*
-*   vchiq_shutdown
-*
-***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
 {

@@ -168,22 +155,12 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
 }
 EXPORT_SYMBOL(vchiq_shutdown);
 
-/****************************************************************************
-*
-*   vchiq_is_connected
-*
-***************************************************************************/
 
 static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
 {
 	return instance->connected;
 }
 
-/****************************************************************************
-*
-*   vchiq_connect
-*
-***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
 {

@@ -214,11 +191,6 @@ VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
 }
 EXPORT_SYMBOL(vchiq_connect);
 
-/****************************************************************************
-*
-*   vchiq_add_service
-*
-***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_add_service(
 	VCHIQ_INSTANCE_T              instance,

@@ -259,11 +231,6 @@ VCHIQ_STATUS_T vchiq_add_service(
 }
 EXPORT_SYMBOL(vchiq_add_service);
 
-/****************************************************************************
-*
-*   vchiq_open_service
-*
-***************************************************************************/
 
 VCHIQ_STATUS_T vchiq_open_service(
 	VCHIQ_INSTANCE_T              instance,

Signature · 1 line

2.11.0

Greg KH

maintainer

2017-12-14 20:57 UTC #4 lore raw

Re: [PATCH 1/3] staging: vchiq_arm: Remove useless comments

Quoted 1 line · Mikhail Shvetsov

Signed-off-by Mikhail Shvetsov <[email protected]>

I can't take patches without any changelog text at all.

Please fix all of these up and resend.

thanks,

greg k-h

Mikhail Shvetsov

author

2017-12-20 12:30 UTC #5 lore raw

PATCH 1/3 staging: vchiq_arm: Remove useless comments.

This removes useless comments duplicate function names.

Signed-off-by Mikhail Shvetsov <[email protected]>

---
 .../interface/vchiq_arm/vchiq_kern_lib.c           | 35 ----------------------
 1 file changed, 35 deletions(-)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +0 ~~-35~~

index 34f746db19cd..6152596d23ea 100644
@@ -64,11 +64,6 @@ static VCHIQ_STATUS_T
 vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 	unsigned int size, VCHIQ_BULK_DIR_T dir);
 
-/****************************************************************************
-*
-*   vchiq_initialise
-*
-***************************************************************************/
 #define VCHIQ_INIT_RETRIES 10
 VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 {

@@ -120,12 +115,6 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 }
 EXPORT_SYMBOL(vchiq_initialise);
 
-/****************************************************************************
-*
-*   vchiq_shutdown
-*
-***************************************************************************/
-
 VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
 {
 	VCHIQ_STATUS_T status;

@@ -168,23 +157,11 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
 }
 EXPORT_SYMBOL(vchiq_shutdown);
 
-/****************************************************************************
-*
-*   vchiq_is_connected
-*
-***************************************************************************/
-
 static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
 {
 	return instance->connected;
 }
 
-/****************************************************************************
-*
-*   vchiq_connect
-*
-***************************************************************************/
-
 VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
 {
 	VCHIQ_STATUS_T status;

@@ -214,12 +191,6 @@ VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
 }
 EXPORT_SYMBOL(vchiq_connect);
 
-/****************************************************************************
-*
-*   vchiq_add_service
-*
-***************************************************************************/
-
 VCHIQ_STATUS_T vchiq_add_service(
 	VCHIQ_INSTANCE_T              instance,
 	const VCHIQ_SERVICE_PARAMS_T *params,

@@ -259,12 +230,6 @@ VCHIQ_STATUS_T vchiq_add_service(
 }
 EXPORT_SYMBOL(vchiq_add_service);
 
-/****************************************************************************
-*
-*   vchiq_open_service
-*
-***************************************************************************/
-
 VCHIQ_STATUS_T vchiq_open_service(
 	VCHIQ_INSTANCE_T              instance,
 	const VCHIQ_SERVICE_PARAMS_T *params,

Signature · 1 line

2.11.0

Mikhail Shvetsov

author

2017-12-20 12:30 UTC #6 lore raw

PATCH 2/3 staging: vchiq_arm: Fixing code style of comments

This removes checkpatch.pl warnings:

WARNING: Block comments use a trailing */ on a separate line
WARNING: Block comments should align the * on each line
WARNING: Block comments use * on subsequent lines

Signed-off-by Mikhail Shvetsov <[email protected]>

---
 .../vc04_services/interface/vchiq_arm/vchiq_kern_lib.c       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +8 -4

index 6152596d23ea..3c9f97d60019 100644
@@ -75,7 +75,9 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 	vchiq_log_trace(vchiq_core_log_level, "%s called", __func__);
 
 	/* VideoCore may not be ready due to boot up timing.
-	   It may never be ready if kernel and firmware are mismatched, so don't block forever. */
+	 * It may never be ready if kernel and firmware are mismatched,so don't
+	 * block forever.
+	 */
 	for (i = 0; i < VCHIQ_INIT_RETRIES; i++) {
 		state = vchiq_get_state();
 		if (state)

@@ -379,8 +381,9 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 			if ((bulk->data != data) ||
 				(bulk->size != size)) {
 				/* This is not a retry of the previous one.
-				** Cancel the signal when the transfer
-				** completes. */
+				 * Cancel the signal when the transfer
+				 * completes.
+				 */
 				spin_lock(&bulk_waiter_spinlock);
 				bulk->userdata = NULL;
 				spin_unlock(&bulk_waiter_spinlock);

@@ -406,7 +409,8 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 
 		if (bulk) {
 			/* Cancel the signal when the transfer
-			 ** completes. */
+			 * completes.
+			 */
 			spin_lock(&bulk_waiter_spinlock);
 			bulk->userdata = NULL;
 			spin_unlock(&bulk_waiter_spinlock);

Signature · 1 line

2.11.0

Mikhail Shvetsov

author

2017-12-20 12:30 UTC #7 lore raw

PATCH 3/3 staging: vchiq_arm: Cleaning up codestyle warnings

In reply to Mikhail Shvetsov

This removes checkpatch.pl warnings:
WARNING: line over 80 characters

Signed-off-by Mikhail Shvetsov <[email protected]>

---
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +2 -1

index 3c9f97d60019..43c89a08bda9 100644
@@ -90,7 +90,8 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 		goto failed;
 	} else if (i > 0) {
 		vchiq_log_warning(vchiq_core_log_level,
-			"%s: videocore initialized after %d retries\n", __func__, i);
+			"%s: videocore initialized after %d retries\n",
+			__func__, i);
 	}
 
 	instance = kzalloc(sizeof(*instance), GFP_KERNEL);

Signature · 1 line

2.11.0

Mikhail Shvetsov

author

2017-12-14 20:40 UTC #8 lore raw

PATCH 2/3 staging: vchiq_arm: Fixing code style of comments

In reply to Mikhail Shvetsov

Signed-off-by Mikhail Shvetsov <[email protected]>

---
 .../vc04_services/interface/vchiq_arm/vchiq_kern_lib.c       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +8 -4

index 4a40b9b31a5a..48f05062fc12 100644
@@ -72,7 +72,9 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 	vchiq_log_trace(vchiq_core_log_level, "%s called", __func__);
 
 	/* VideoCore may not be ready due to boot up timing.
-	   It may never be ready if kernel and firmware are mismatched, so don't block forever. */
+	 * It may never be ready if kernel and firmware are mismatched, so don't
+	 * block forever.
+	 */
 	for (i = 0; i < VCHIQ_INIT_RETRIES; i++) {
 		state = vchiq_get_state();
 		if (state)

@@ -381,8 +383,9 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 			if ((bulk->data != data) ||
 				(bulk->size != size)) {
 				/* This is not a retry of the previous one.
-				** Cancel the signal when the transfer
-				** completes. */
+				 * Cancel the signal when the transfer
+				 * completes.
+				 */
 				spin_lock(&bulk_waiter_spinlock);
 				bulk->userdata = NULL;
 				spin_unlock(&bulk_waiter_spinlock);

@@ -408,7 +411,8 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 
 		if (bulk) {
 			/* Cancel the signal when the transfer
-			 ** completes. */
+			 * completes.
+			 */
 			spin_lock(&bulk_waiter_spinlock);
 			bulk->userdata = NULL;
 			spin_unlock(&bulk_waiter_spinlock);

Signature · 1 line

2.11.0

Mikhail Shvetsov

author

2017-12-14 20:40 UTC #9 lore raw

PATCH 3/3 staging: vchiq_arm: Fixing code lines over 80 characters

In reply to Mikhail Shvetsov

Signed-off-by Mikhail Shvetsov <[email protected]>

---
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +2 -1

index 48f05062fc12..7a803d136987 100644
@@ -87,7 +87,8 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 		goto failed;
 	} else if (i > 0) {
 		vchiq_log_warning(vchiq_core_log_level,
-			"%s: videocore initialized after %d retries\n", __func__, i);
+			"%s: videocore initialized after %d retries\n",
+			__func__, i);
 	}
 
 	instance = kzalloc(sizeof(*instance), GFP_KERNEL);

Signature · 1 line

2.11.0