[PATCH v2] trivial: staging: vc04_services: replace bitshift with BIT macro

2020-06-25 Thread Garrit Franke 
Cleans up some bitshifts by using the BIT macro.

Signed-off-by: Garrit Franke 
---
 .../interface/vchiq_arm/vchiq_core.c  | 22 +--
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c 
b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index ae9183db44ee..e0027148963e 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -39,9 +39,9 @@ struct vchiq_openack_payload {
 };
 
 enum {
-   QMFLAGS_IS_BLOCKING = (1 << 0),
-   QMFLAGS_NO_MUTEX_LOCK   = (1 << 1),
-   QMFLAGS_NO_MUTEX_UNLOCK = (1 << 2)
+   QMFLAGS_IS_BLOCKING = BIT(0),
+   QMFLAGS_NO_MUTEX_LOCK   = BIT(1),
+   QMFLAGS_NO_MUTEX_UNLOCK = BIT(2)
 };
 
 /* we require this for consistency between endpoints */
@@ -526,14 +526,14 @@ request_poll(struct vchiq_state *state, struct 
vchiq_service *service,
do {
value = atomic_read(&service->poll_flags);
} while (atomic_cmpxchg(&service->poll_flags, value,
-   value | (1 << poll_type)) != value);
+   value | BIT(poll_type)) != value);
 
do {
value = atomic_read(&state->poll_services[
service->localport>>5]);
} while (atomic_cmpxchg(
&state->poll_services[service->localport>>5],
-   value, value | (1 << (service->localport & 0x1f)))
+   value, value | BIT(service->localport & 0x1f))
!= value);
}
 
@@ -1287,19 +1287,19 @@ poll_services(struct vchiq_state *state)
 
flags = atomic_xchg(&state->poll_services[group], 0);
for (i = 0; flags; i++) {
-   if (flags & (1 << i)) {
+   if (flags & BIT(i)) {
struct vchiq_service *service =
find_service_by_port(state,
(group<<5) + i);
u32 service_flags;
 
-   flags &= ~(1 << i);
+   flags &= ~BIT(i);
if (!service)
continue;
service_flags =
atomic_xchg(&service->poll_flags, 0);
if (service_flags &
-   (1 << VCHIQ_POLL_REMOVE)) {
+   BIT(VCHIQ_POLL_REMOVE)) {
vchiq_log_info(vchiq_core_log_level,
"%d: ps - remove %d<->%d",
state->id, service->localport,
@@ -1317,7 +1317,7 @@ poll_services(struct vchiq_state *state)
request_poll(state, service,
VCHIQ_POLL_REMOVE);
} else if (service_flags &
-   (1 << VCHIQ_POLL_TERMINATE)) {
+   BIT(VCHIQ_POLL_TERMINATE)) {
vchiq_log_info(vchiq_core_log_level,
"%d: ps - terminate %d<->%d",
state->id, service->localport,
@@ -1328,11 +1328,11 @@ poll_services(struct vchiq_state *state)
request_poll(state, service,
VCHIQ_POLL_TERMINATE);
}
-   if (service_flags & (1 << VCHIQ_POLL_TXNOTIFY))
+   if (service_flags & BIT(VCHIQ_POLL_TXNOTIFY))
notify_bulks(service,
&service->bulk_tx,
1/*retry_poll*/);
-   if (service_flags & (1 << VCHIQ_POLL_RXNOTIFY))
+   if (service_flags & BIT(VCHIQ_POLL_RXNOTIFY))
notify_bulks(service,
&service->bulk_rx,
1/*retry_poll*/);
-- 
2.25.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH v2 1/2] staging: vc04_services: vchiq_arm: replace bitshift with BIT macro

2020-06-24 Thread Garrit Franke 
This should prevent possible overflowing bits by using the BIT macro in
vchiq_core

Signed-off-by: Garrit Franke 
---
 .../interface/vchiq_arm/vchiq_core.c  | 22 +--
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c 
b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index ae9183db44ee..5a6d2bd59ec0 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -39,9 +39,9 @@ struct vchiq_openack_payload {
 };
 
 enum {
-   QMFLAGS_IS_BLOCKING = (1 << 0),
-   QMFLAGS_NO_MUTEX_LOCK   = (1 << 1),
-   QMFLAGS_NO_MUTEX_UNLOCK = (1 << 2)
+   QMFLAGS_IS_BLOCKING = BIT(0),
+   QMFLAGS_NO_MUTEX_LOCK   = BIT(1),
+   QMFLAGS_NO_MUTEX_UNLOCK = BIT(2)
 };
 
 /* we require this for consistency between endpoints */
@@ -526,14 +526,14 @@ request_poll(struct vchiq_state *state, struct 
vchiq_service *service,
do {
value = atomic_read(&service->poll_flags);
} while (atomic_cmpxchg(&service->poll_flags, value,
-   value | (1 << poll_type)) != value);
+   value | BIT(poll_type)) != value);
 
do {
value = atomic_read(&state->poll_services[
service->localport>>5]);
} while (atomic_cmpxchg(
&state->poll_services[service->localport>>5],
-   value, value | (1 << (service->localport & 0x1f)))
+   value, value | BIT((service->localport & 0x1f)))
!= value);
}
 
@@ -1287,19 +1287,19 @@ poll_services(struct vchiq_state *state)
 
flags = atomic_xchg(&state->poll_services[group], 0);
for (i = 0; flags; i++) {
-   if (flags & (1 << i)) {
+   if (flags & BIT(i)) {
struct vchiq_service *service =
find_service_by_port(state,
(group<<5) + i);
u32 service_flags;
 
-   flags &= ~(1 << i);
+   flags &= ~BIT(i);
if (!service)
continue;
service_flags =
atomic_xchg(&service->poll_flags, 0);
if (service_flags &
-   (1 << VCHIQ_POLL_REMOVE)) {
+   BIT(VCHIQ_POLL_REMOVE)) {
vchiq_log_info(vchiq_core_log_level,
"%d: ps - remove %d<->%d",
state->id, service->localport,
@@ -1317,7 +1317,7 @@ poll_services(struct vchiq_state *state)
request_poll(state, service,
VCHIQ_POLL_REMOVE);
} else if (service_flags &
-   (1 << VCHIQ_POLL_TERMINATE)) {
+   BIT(VCHIQ_POLL_TERMINATE)) {
vchiq_log_info(vchiq_core_log_level,
"%d: ps - terminate %d<->%d",
state->id, service->localport,
@@ -1328,11 +1328,11 @@ poll_services(struct vchiq_state *state)
request_poll(state, service,
VCHIQ_POLL_TERMINATE);
}
-   if (service_flags & (1 << VCHIQ_POLL_TXNOTIFY))
+   if (service_flags & BIT(VCHIQ_POLL_TXNOTIFY))
notify_bulks(service,
&service->bulk_tx,
1/*retry_poll*/);
-   if (service_flags & (1 << VCHIQ_POLL_RXNOTIFY))
+   if (service_flags & BIT(VCHIQ_POLL_RXNOTIFY))
notify_bulks(service,
&service->bulk_rx,
1/*retry_poll*/);
-- 
2.25.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH v2 2/2] staging: vc04_services: vchiq_arm: Remove unnecessary parens

2020-06-24 Thread Garrit Franke 
Signed-off-by: Garrit Franke 

---
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c 
b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 5a6d2bd59ec0..e0027148963e 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -533,7 +533,7 @@ request_poll(struct vchiq_state *state, struct 
vchiq_service *service,
service->localport>>5]);
} while (atomic_cmpxchg(
&state->poll_services[service->localport>>5],
-   value, value | BIT((service->localport & 0x1f)))
+   value, value | BIT(service->localport & 0x1f))
!= value);
}
 
-- 
2.25.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH v2 0/2] staging: vc04_services: vchiq_arm: replace bitshift with BIT macro

2020-06-24 Thread Garrit Franke 
Hi Dan,

thanks for your review. Yes, this is supposed to be a cleanup. I didn't
make that clear. I removed the unnecessary parentheses, as suggested.

Regards,
Garrit Franke

Garrit Franke (2):
  staging: vc04_services: vchiq_arm: replace bitshift with BIT macro
  staging: vc04_services: vchiq_arm: Remove unnecessary parens

 .../interface/vchiq_arm/vchiq_core.c  | 22 +--
 1 file changed, 11 insertions(+), 11 deletions(-)

-- 
2.25.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] staging: vc04_services: vchiq_arm: replace bitshift with BIT macro

2020-06-18 Thread Garrit Franke 
This should prevent possible overflowing bits by using the BIT macro in
vchiq_core

Signed-off-by: Garrit Franke 
---
 .../interface/vchiq_arm/vchiq_core.c  | 22 +--
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c 
b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index ae9183db44ee..5a6d2bd59ec0 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -39,9 +39,9 @@ struct vchiq_openack_payload {
 };
 
 enum {
-   QMFLAGS_IS_BLOCKING = (1 << 0),
-   QMFLAGS_NO_MUTEX_LOCK   = (1 << 1),
-   QMFLAGS_NO_MUTEX_UNLOCK = (1 << 2)
+   QMFLAGS_IS_BLOCKING = BIT(0),
+   QMFLAGS_NO_MUTEX_LOCK   = BIT(1),
+   QMFLAGS_NO_MUTEX_UNLOCK = BIT(2)
 };
 
 /* we require this for consistency between endpoints */
@@ -526,14 +526,14 @@ request_poll(struct vchiq_state *state, struct 
vchiq_service *service,
do {
value = atomic_read(&service->poll_flags);
} while (atomic_cmpxchg(&service->poll_flags, value,
-   value | (1 << poll_type)) != value);
+   value | BIT(poll_type)) != value);
 
do {
value = atomic_read(&state->poll_services[
service->localport>>5]);
} while (atomic_cmpxchg(
&state->poll_services[service->localport>>5],
-   value, value | (1 << (service->localport & 0x1f)))
+   value, value | BIT((service->localport & 0x1f)))
!= value);
}
 
@@ -1287,19 +1287,19 @@ poll_services(struct vchiq_state *state)
 
flags = atomic_xchg(&state->poll_services[group], 0);
for (i = 0; flags; i++) {
-   if (flags & (1 << i)) {
+   if (flags & BIT(i)) {
struct vchiq_service *service =
find_service_by_port(state,
(group<<5) + i);
u32 service_flags;
 
-   flags &= ~(1 << i);
+   flags &= ~BIT(i);
if (!service)
continue;
service_flags =
atomic_xchg(&service->poll_flags, 0);
if (service_flags &
-   (1 << VCHIQ_POLL_REMOVE)) {
+   BIT(VCHIQ_POLL_REMOVE)) {
vchiq_log_info(vchiq_core_log_level,
"%d: ps - remove %d<->%d",
state->id, service->localport,
@@ -1317,7 +1317,7 @@ poll_services(struct vchiq_state *state)
request_poll(state, service,
VCHIQ_POLL_REMOVE);
} else if (service_flags &
-   (1 << VCHIQ_POLL_TERMINATE)) {
+   BIT(VCHIQ_POLL_TERMINATE)) {
vchiq_log_info(vchiq_core_log_level,
"%d: ps - terminate %d<->%d",
state->id, service->localport,
@@ -1328,11 +1328,11 @@ poll_services(struct vchiq_state *state)
request_poll(state, service,
VCHIQ_POLL_TERMINATE);
}
-   if (service_flags & (1 << VCHIQ_POLL_TXNOTIFY))
+   if (service_flags & BIT(VCHIQ_POLL_TXNOTIFY))
notify_bulks(service,
&service->bulk_tx,
1/*retry_poll*/);
-   if (service_flags & (1 << VCHIQ_POLL_RXNOTIFY))
+   if (service_flags & BIT(VCHIQ_POLL_RXNOTIFY))
notify_bulks(service,
&service->bulk_rx,
1/*retry_poll*/);
-- 
2.25.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] staging: comedi: fix up missing whitespace in comment

2020-06-15 Thread Garrit Franke 
From: Garrit Franke 

I noticed this missing whitespace in a comment inside ni_mio_common.c

Signed-off-by: Garrit Franke 
---
 drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c 
b/drivers/staging/comedi/drivers/ni_mio_common.c
index d99f4065b96d..9266e13f6271 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -2390,7 +2390,7 @@ static int ni_ai_cmd(struct comedi_device *dev, struct 
comedi_subdevice *s)
 #endif
break;
case AIMODE_SAMPLE:
-   /*generate FIFO interrupts on non-empty */
+   /* generate FIFO interrupts on non-empty */
ni_stc_writew(dev, NISTC_AI_MODE3_FIFO_MODE_NE,
  NISTC_AI_MODE3_REG);
break;
-- 
2.25.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel