Merge branch 'photon'

drivers/wireless/ieee80211/Make.defs

@@ -47,7 +47,7 @@ ifeq ($(CONFIG_IEEE80211_BROADCOM_FULLMAC),y)
   CSRCS += bcmf_utils.c
   CSRCS += bcmf_netdev.c
 
-ifeq ($(CONFIG_IEEE80211_BROADCOM_FULLMAC_SDIO),y)  
+ifeq ($(CONFIG_IEEE80211_BROADCOM_FULLMAC_SDIO),y)
   CSRCS += mmc_sdio.c
   CSRCS += bcmf_sdio.c
   CSRCS += bcmf_core.c

drivers/wireless/ieee80211/bcmf_bdc.c

@@ -115,7 +115,7 @@ struct bcmf_frame_s *bcmf_bdc_allocate_frame(FAR struct bcmf_dev_s *priv,
 
   frame->data += sizeof(struct bcmf_bdc_header);
 
-  return frame; 
+  return frame;
 }
 
 int bcmf_bdc_process_event_frame(FAR struct bcmf_dev_s *priv,

drivers/wireless/ieee80211/bcmf_cdc.c

@@ -130,7 +130,7 @@ struct bcmf_frame_s *bcmf_cdc_allocate_frame(FAR struct bcmf_dev_s *priv,
   frame = priv->bus->allocate_frame(priv,
                 sizeof(struct bcmf_cdc_header) + data_len + name_len,
                 true, true);
-  
+
   if (!frame)
     {
       return NULL;

drivers/wireless/ieee80211/bcmf_core.c

@@ -339,8 +339,9 @@ void bcmf_core_disable(FAR struct bcmf_sdio_dev_s *sbus, unsigned int core)
       wlerr("Invalid core id %d\n", core);
       return;
     }
+
   uint32_t base = sbus->chip->core_base[core];
-  
+
   /* Check if core is already in reset state */
 
   bcmf_read_sbregb(sbus, base + BCMA_RESET_CTL, &value);

drivers/wireless/ieee80211/bcmf_driver.c

@@ -201,7 +201,7 @@ int bcmf_wl_set_mac_address(FAR struct bcmf_dev_s *priv, struct ifreq *req)
 
   memcpy(priv->bc_dev.d_mac.ether.ether_addr_octet,
          req->ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
-    
+
   return OK;
 }
 
@@ -912,4 +912,3 @@ int bcmf_wl_set_ssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
     }
   return OK;
  }
- 

drivers/wireless/ieee80211/bcmf_netdev.c

@@ -210,7 +210,7 @@ static int bcmf_transmit(FAR struct bcmf_dev_s *priv,
 
   frame->len = priv->bc_dev.d_len +
       (unsigned int)(frame->data - frame->base);
-  
+
   ret = bcmf_bdc_transmit_frame(priv, frame);
 
   if (ret)

drivers/wireless/ieee80211/bcmf_sdio.c

@@ -159,7 +159,7 @@ int bcmf_sdio_bus_sleep(FAR struct bcmf_sdio_dev_s *sbus, bool sleep)
   else
     {
       /* Request HT Avail */
-  
+
       ret = bcmf_write_reg(sbus, 1, SBSDIO_FUNC1_CHIPCLKCSR,
                            SBSDIO_HT_AVAIL_REQ | SBSDIO_FORCE_HT);
       if (ret != OK)
@@ -167,27 +167,27 @@ int bcmf_sdio_bus_sleep(FAR struct bcmf_sdio_dev_s *sbus, bool sleep)
           wlerr("HT Avail request failed %d\n", ret);
           return ret;
         }
-  
+
       /* Wait for High Troughput clock */
-  
+
       loops = 20;
       while (--loops > 0)
         {
           up_mdelay(1);
           ret = bcmf_read_reg(sbus, 1, SBSDIO_FUNC1_CHIPCLKCSR, &value);
-  
+
           if (ret != OK)
             {
               return ret;
             }
-  
+
           if (value & SBSDIO_HT_AVAIL)
             {
               /* High Throughput clock is ready */
               break;
             }
         }
-  
+
       if (loops <= 0)
         {
           wlerr("HT clock not ready\n");
@@ -196,7 +196,7 @@ int bcmf_sdio_bus_sleep(FAR struct bcmf_sdio_dev_s *sbus, bool sleep)
 
       sbus->sleeping = false;
     }
-  
+
   return OK;
 }
 
@@ -597,7 +597,7 @@ int bcmf_bus_sdio_initialize(FAR struct bcmf_dev_s *priv,
     {
       bcmf_dqueue_push(&sbus->free_queue, &g_pktframes[ret].list_entry);
     }
-  
+
   /* Init thread semaphore */
 
   if ((ret = sem_init(&sbus->thread_signal, 0, 0)) != OK)
@@ -740,13 +740,13 @@ int bcmf_sdio_thread(int argc, char **argv)
   int ret;
   FAR struct bcmf_dev_s *priv = g_sdio_priv;
   FAR struct bcmf_sdio_dev_s *sbus = (FAR struct bcmf_sdio_dev_s *)priv->bus;
-  
+
   wlinfo("Enter\n");
 
   /*  FIXME wait for the chip to be ready to receive commands */
 
   up_mdelay(50);
-  
+
   while (sbus->ready)
     {
       /* Wait for event (device interrupt, user request or waitdog timer) */
@@ -796,7 +796,7 @@ int bcmf_sdio_thread(int argc, char **argv)
               ret = bcmf_sdpcm_readframe(priv);
             }
           while (ret == OK);
-          
+
           if (ret == -ENODATA)
             {
               /*  All frames processed */

drivers/wireless/ieee80211/bcmf_sdpcm.c

@@ -223,7 +223,7 @@ int bcmf_sdpcm_readframe(FAR struct bcmf_dev_s *priv)
       goto exit_free_frame;
     }
 
-  /* Update frame structure */  
+  /* Update frame structure */
 
   sframe->header.len = header->size;
   sframe->header.data += header->data_offset;

drivers/wireless/ieee80211/mmc_sdio.c

@@ -243,7 +243,7 @@ int sdio_set_wide_bus(struct sdio_dev_s *dev)
     {
       return ret;
     }
-  
+
   SDIO_WIDEBUS(dev, true);
   return OK;
 }
@@ -343,7 +343,7 @@ int sdio_enable_function(FAR struct sdio_dev_s *dev, uint8_t function)
     {
       return ret;
     }
- 
+
   ret = sdio_io_rw_direct(dev, true, 0, SDIO_CCCR_IOEN, value | (1 << function), NULL);
 
   if (ret != OK)