[PATCH] staging: pi433: fix CamelCase for payload identifiers

[Valentin Vidic]

Fixes checkpatch warnings:

  CHECK: Avoid CamelCase: 
  CHECK: Avoid CamelCase: 

Signed-off-by: Valentin Vidic 
---
 drivers/staging/pi433/pi433_if.c  | 2 +-
 drivers/staging/pi433/rf69.c  | 6 +++---
 drivers/staging/pi433/rf69.h  | 2 +-
 drivers/staging/pi433/rf69_enum.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 1d7c50c1ac23..4de003fe72e7 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -510,7 +510,7 @@ pi433_receive(void *data)
 
/* get payload */
while (dev->rx_position < bytes_total) {
-   if (!rf69_get_flag(dev->spi, payloadReady)) {
+   if (!rf69_get_flag(dev->spi, payload_ready)) {
retval = wait_event_interruptible(dev->fifo_wait_queue,
  dev->free_in_fifo < 
FIFO_SIZE);
if (retval) /* wait was interrupted */
diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index d0bb94a22f2f..78b3f257ac06 100644
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -509,7 +509,7 @@ bool rf69_get_flag(struct spi_device *spi, enum flag flag)
case fifo_level_below_threshold: return (rf69_read_reg(spi, 
REG_IRQFLAGS2) & MASK_IRQFLAGS2_FIFO_LEVEL);
case fifo_overrun:   return (rf69_read_reg(spi, 
REG_IRQFLAGS2) & MASK_IRQFLAGS2_FIFO_OVERRUN);
case packetSent: return (rf69_read_reg(spi, 
REG_IRQFLAGS2) & MASK_IRQFLAGS2_PACKET_SENT);
-   case payloadReady:   return (rf69_read_reg(spi, 
REG_IRQFLAGS2) & MASK_IRQFLAGS2_PAYLOAD_READY);
+   case payload_ready:  return (rf69_read_reg(spi, 
REG_IRQFLAGS2) & MASK_IRQFLAGS2_PAYLOAD_READY);
case crcOk:  return (rf69_read_reg(spi, 
REG_IRQFLAGS2) & MASK_IRQFLAGS2_CRC_OK);
case batteryLow: return (rf69_read_reg(spi, 
REG_IRQFLAGS2) & MASK_IRQFLAGS2_LOW_BAT);
default: return false;
@@ -649,9 +649,9 @@ int rf69_set_adressFiltering(struct spi_device *spi, enum 
addressFiltering addre
}
 }
 
-int rf69_set_payload_length(struct spi_device *spi, u8 payloadLength)
+int rf69_set_payload_length(struct spi_device *spi, u8 payload_length)
 {
-   return rf69_write_reg(spi, REG_PAYLOAD_LENGTH, payloadLength);
+   return rf69_write_reg(spi, REG_PAYLOAD_LENGTH, payload_length);
 }
 
 int rf69_set_node_address(struct spi_device *spi, u8 nodeAddress)
diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index f8c015ab3ff3..8a48a188ef31 100644
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -56,7 +56,7 @@ int rf69_set_packet_format(struct spi_device *spi, enum 
packetFormat packetForma
 int rf69_enable_crc(struct spi_device *spi);
 int rf69_disable_crc(struct spi_device *spi);
 int rf69_set_adressFiltering(struct spi_device *spi, enum addressFiltering 
addressFiltering);
-int rf69_set_payload_length(struct spi_device *spi, u8 payloadLength);
+int rf69_set_payload_length(struct spi_device *spi, u8 payload_length);
 int rf69_set_node_address(struct spi_device *spi, u8 nodeAddress);
 int rf69_set_broadcast_address(struct spi_device *spi, u8 broadcastAddress);
 int rf69_set_tx_start_condition(struct spi_device *spi, enum txStartCondition 
txStartCondition);
diff --git a/drivers/staging/pi433/rf69_enum.h 
b/drivers/staging/pi433/rf69_enum.h
index 77b97d173f87..03440cfa957c 100644
--- a/drivers/staging/pi433/rf69_enum.h
+++ b/drivers/staging/pi433/rf69_enum.h
@@ -108,7 +108,7 @@ enum flag {
fifo_level_below_threshold,
fifo_overrun,
packetSent,
-   payloadReady,
+   payload_ready,
crcOk,
batteryLow
 };
-- 
2.15.1

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

[PATCH] staging: vc05_services: fix checkpatch.pl errors

[Sidong Yang]

Fix some errors for wrong brace position reported by checkpatch.

Signed-off-by: Sidong Yang 
---
 .../vc04_services/interface/vchiq_arm/vchiq_2835_arm.c   |  3 +--
 .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c| 12 
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 
b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 315b49c1de3b..edff4fb99781 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -485,8 +485,7 @@ create_pagelist(char __user *buf, size_t count, unsigned 
short type)
   __func__, actual_pages, num_pages);
 
/* This is probably due to the process being killed */
-   while (actual_pages > 0)
-   {
+   while (actual_pages > 0) {
actual_pages--;
put_page(pages[actual_pages]);
}
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c 
b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 411539f8ff8c..c2c440009cac 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -682,8 +682,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned 
long arg)
if (user_service->close_pending &&
down_interruptible(_service->close_event))
status = VCHIQ_RETRY;
-   }
-   else
+   } else
ret = -EINVAL;
} break;
 
@@ -708,8 +707,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned 
long arg)
if (user_service->close_pending &&
down_interruptible(_service->close_event))
status = VCHIQ_RETRY;
-   }
-   else
+   } else
ret = -EINVAL;
} break;
 
@@ -1171,8 +1169,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned 
long arg)
USER_SERVICE_T *user_service =
(USER_SERVICE_T *)service->base.userdata;
close_delivered(user_service);
-   }
-   else
+   } else
ret = -EINVAL;
} break;
 
@@ -1810,8 +1807,7 @@ vchiq_release(struct inode *inode, struct file *file)
instance->completion_remove &
(MAX_COMPLETIONS - 1)];
service = completion->service_userdata;
-   if (completion->reason == VCHIQ_SERVICE_CLOSED)
-   {
+   if (completion->reason == VCHIQ_SERVICE_CLOSED) {
USER_SERVICE_T *user_service =
service->base.userdata;
 
-- 
2.11.0

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