1 files changed, 12 insertions, 13 deletions

diff --git a/drivers/staging/cx25821/cx25821-gpio.c b/drivers/staging/cx25821/cx25821-gpio.c
index e8a37b47e437..2f154b3658a1 100644
--- a/drivers/staging/cx25821/cx25821-gpio.c
+++ b/drivers/staging/cx25821/cx25821-gpio.c
@@ -31,7 +31,7 @@ void cx25821_set_gpiopin_direction(struct cx25821_dev *dev,
         u32 gpio_register = 0;
         u32 value = 0;
 
-        // Check for valid pinNumber
+        /* Check for valid pinNumber */
         if (pin_number >= 47)
                 return;
 
@@ -39,14 +39,14 @@ void cx25821_set_gpiopin_direction(struct cx25821_dev *dev,
                 bit = pin_number - 31;
                 gpio_oe_reg = GPIO_HI_OE;
         }
-        // Here we will make sure that the GPIOs 0 and 1 are output. keep the rest as is
+        /* Here we will make sure that the GPIOs 0 and 1 are output. keep the
+         * rest as is */
         gpio_register = cx_read(gpio_oe_reg);
 
-        if (pin_logic_value == 1) {
+        if (pin_logic_value == 1)
                 value = gpio_register | Set_GPIO_Bit(bit);
-        } else {
+        else
                 value = gpio_register & Clear_GPIO_Bit(bit);
-        }
 
         cx_write(gpio_oe_reg, value);
 }
@@ -58,11 +58,12 @@ static void cx25821_set_gpiopin_logicvalue(struct cx25821_dev *dev,
         u32 gpio_reg = GPIO_LO;
         u32 value = 0;
 
-        // Check for valid pinNumber
+        /* Check for valid pinNumber */
         if (pin_number >= 47)
                 return;
 
-        cx25821_set_gpiopin_direction(dev, pin_number, 0);      // change to output direction
+        /* change to output direction */
+        cx25821_set_gpiopin_direction(dev, pin_number, 0);
 
         if (pin_number > 31) {
                 bit = pin_number - 31;
@@ -71,25 +72,23 @@ static void cx25821_set_gpiopin_logicvalue(struct cx25821_dev *dev,
 
         value = cx_read(gpio_reg);
 
-        if (pin_logic_value == 0) {
+        if (pin_logic_value == 0)
                 value &= Clear_GPIO_Bit(bit);
-        } else {
+        else
                 value |= Set_GPIO_Bit(bit);
-        }
 
         cx_write(gpio_reg, value);
 }
 
 void cx25821_gpio_init(struct cx25821_dev *dev)
 {
-        if (dev == NULL) {
+        if (dev == NULL)
                 return;
-        }
 
         switch (dev->board) {
         case CX25821_BOARD_CONEXANT_ATHENA10:
         default:
-                //set GPIO 5 to select the path for Medusa/Athena
+                /* set GPIO 5 to select the path for Medusa/Athena */
                 cx25821_set_gpiopin_logicvalue(dev, 5, 1);
                 mdelay(20);
                 break;