Fix the following coccicheck warnings:
./drivers/firewire/core-device.c:973:22-23: WARNING: sum of probable
bitmasks, consider |.
./drivers/firewire/core-device.c:954:22-23: WARNING: sum of probable
bitmasks, consider |.
Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
drivers/firewire/core-device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index 6821698..e04832d 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -951,7 +951,7 @@ static void set_broadcast_channel(struct fw_device *device, int generation)
if (device->bc_implemented == BC_UNKNOWN) {
rcode = fw_run_transaction(card, TCODE_READ_QUADLET_REQUEST,
device->node_id, generation, device->max_speed,
- CSR_REGISTER_BASE + CSR_BROADCAST_CHANNEL,
+ CSR_REGISTER_BASE | CSR_BROADCAST_CHANNEL,
&data, 4);
switch (rcode) {
case RCODE_COMPLETE:
@@ -970,7 +970,7 @@ static void set_broadcast_channel(struct fw_device *device, int generation)
BROADCAST_CHANNEL_VALID);
fw_run_transaction(card, TCODE_WRITE_QUADLET_REQUEST,
device->node_id, generation, device->max_speed,
- CSR_REGISTER_BASE + CSR_BROADCAST_CHANNEL,
+ CSR_REGISTER_BASE | CSR_BROADCAST_CHANNEL,
&data, 4);
}
}
--
1.8.3.1
On Mar 09 Jiapeng Chong wrote:
> Fix the following coccicheck warnings:
>
> ./drivers/firewire/core-device.c:973:22-23: WARNING: sum of probable
> bitmasks, consider |.
>
> ./drivers/firewire/core-device.c:954:22-23: WARNING: sum of probable
> bitmasks, consider |.
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> drivers/firewire/core-device.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
> index 6821698..e04832d 100644
> --- a/drivers/firewire/core-device.c
> +++ b/drivers/firewire/core-device.c
> @@ -951,7 +951,7 @@ static void set_broadcast_channel(struct fw_device *device, int generation)
> if (device->bc_implemented == BC_UNKNOWN) {
> rcode = fw_run_transaction(card, TCODE_READ_QUADLET_REQUEST,
> device->node_id, generation, device->max_speed,
> - CSR_REGISTER_BASE + CSR_BROADCAST_CHANNEL,
> + CSR_REGISTER_BASE | CSR_BROADCAST_CHANNEL,
> &data, 4);
> switch (rcode) {
> case RCODE_COMPLETE:
> @@ -970,7 +970,7 @@ static void set_broadcast_channel(struct fw_device *device, int generation)
> BROADCAST_CHANNEL_VALID);
> fw_run_transaction(card, TCODE_WRITE_QUADLET_REQUEST,
> device->node_id, generation, device->max_speed,
> - CSR_REGISTER_BASE + CSR_BROADCAST_CHANNEL,
> + CSR_REGISTER_BASE | CSR_BROADCAST_CHANNEL,
> &data, 4);
> }
> }
It's "base address + address offset". The arithmetic operator is correct.
--
Stefan Richter
-======--=-= --== -===-
http://arcgraph.de/sr/