Remove the unnessary empty line after label

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

arch/arm/src/cxd56xx/cxd56_geofence.c

@@ -485,28 +485,21 @@ static int cxd56_geofence_initialize(struct cxd56_geofence_dev_s *dev)
 static ssize_t cxd56_geofence_read(struct file *filep, char *buffer,
                                    size_t len)
 {
-  int32_t ret = 0;
-
   /* Check argument */
 
   if (!buffer)
     {
-      ret = -EINVAL;
+      return -EINVAL;
-      goto _err;
     }
 
   if (len == 0)
     {
-      ret = 0;
+      return 0;
-      goto _err;
     }
 
   /* fw_gd_readbuffer returns copied data size or negative error code */
 
-  ret = fw_gd_readbuffer(CXD56_CPU1_DEV_GEOFENCE, 0, buffer, len);
+  return fw_gd_readbuffer(CXD56_CPU1_DEV_GEOFENCE, 0, buffer, len);
-
-  _err:
-  return ret;
 }
 
 /****************************************************************************
@@ -653,33 +646,33 @@ static int cxd56_geofence_register(const char *devpath)
   if (ret < 0)
     {
       gnsserr("Failed to initialize geofence device!\n");
-      goto _err0;
+      goto err0;
     }
 
   ret = register_driver(devpath, &g_geofencefops, 0666, priv);
   if (ret < 0)
     {
       gnsserr("Failed to register driver: %d\n", ret);
-      goto _err0;
+      goto err0;
     }
 
   ret = cxd56_cpu1siginit(CXD56_CPU1_DEV_GEOFENCE, priv);
   if (ret < 0)
     {
       gnsserr("Failed to initialize ICC for GPS CPU: %d\n", ret);
-      goto _err2;
+      goto err1;
     }
 
   cxd56_cpu1sigregisterhandler(CXD56_CPU1_DEV_GEOFENCE,
                                cxd56_geofence_sighandler);
 
   gnssinfo("GEOFENCE driver loaded successfully!\n");
-
   return ret;
 
-  _err2:
+err1:
   unregister_driver(devpath);
-  _err0:
+
+err0:
   kmm_free(priv);
   return ret;
 }

arch/arm/src/cxd56xx/cxd56_gnss.c

@@ -1511,14 +1511,14 @@ static int cxd56_gnss_set_signal(struct file *filep, unsigned long arg)
                checksig->pid == pid)
         {
           checksig->enable = 0;
-          goto _success;
+          goto success;
         }
     }
 
   if (sig == NULL)
     {
       ret = -ENOENT;
-      goto _err;
+      goto err;
     }
 
   fw_gd_setnotifymask(setting->gnsssig, FALSE);
@@ -1530,8 +1530,8 @@ static int cxd56_gnss_set_signal(struct file *filep, unsigned long arg)
   sig->info.signo   = setting->signo;
   sig->info.data    = setting->data;
 
-  _success:
+success:
-  _err:
+err:
   nxsem_post(&priv->devsem);
 #endif /* CONFIG_CXD56_GNSS_NSIGNALRECEIVERS != 0 */
 
@@ -2138,26 +2138,26 @@ cxd56_gnss_read_cep_file(struct file *fp, int32_t offset,
   if (fp == NULL)
     {
       ret = -ENOENT;
-      goto _err0;
+      goto err0;
     }
 
   buf = (char *)kmm_malloc(len);
   if (buf == NULL)
     {
       ret = -ENOMEM;
-      goto _err0;
+      goto err0;
     }
 
   ret = file_seek(fp, offset, SEEK_SET);
   if (ret < 0)
     {
-      goto _err1;
+      goto err1;
     }
 
   ret = file_read(fp, buf, len);
   if (ret <= 0)
     {
-      goto _err1;
+      goto err1;
     }
 
   *retval = ret;
@@ -2169,9 +2169,9 @@ cxd56_gnss_read_cep_file(struct file *fp, int32_t offset,
    * sequence.
    */
 
-  _err1:
+err1:
   kmm_free(buf);
-  _err0:
+err0:
   *retval = ret;
   cxd56_cpu1sigsend(CXD56_CPU1_DATA_TYPE_CEP, 0);
 
@@ -2204,14 +2204,14 @@ static void cxd56_gnss_read_backup_file(int *retval)
   if (buf == NULL)
     {
       ret = -ENOMEM;
-      goto _err;
+      goto err;
     }
 
   ret = file_open(&file, CONFIG_CXD56_GNSS_BACKUP_FILENAME, O_RDONLY);
   if (ret < 0)
     {
       kmm_free(buf);
-      goto _err;
+      goto err;
     }
 
   do
@@ -2238,7 +2238,7 @@ static void cxd56_gnss_read_backup_file(int *retval)
 
   /* Notify the termination of backup sequence by write zero length data */
 
-  _err:
+err:
   *retval = ret;
   cxd56_cpu1sigsend(CXD56_CPU1_DATA_TYPE_BKUPFILE, 0);
 }
@@ -2458,13 +2458,10 @@ static int cxd56_gnss_cpufifo_api(struct file *filep, unsigned int api,
        */
 
       _warn("Cannot wait GNSS semaphore %d\n", ret);
-      goto _err;
+      return ret;
     }
 
-  ret = priv->apiret;
+  return priv->apiret;
-
-  _err:
-  return ret;
 }
 
 /****************************************************************************
@@ -2608,7 +2605,7 @@ static int cxd56_gnss_open(struct file *filep)
       ret = nxsem_init(&priv->syncsem, 0, 0);
       if (ret < 0)
         {
-          goto _err0;
+          goto err0;
         }
 
       nxsem_set_protocol(&priv->syncsem, SEM_PRIO_NONE);
@@ -2625,13 +2622,13 @@ static int cxd56_gnss_open(struct file *filep)
 
       if (ret < 0)
         {
-          goto _err1;
+          goto err1;
         }
 
       ret = fw_pm_startcpu(CXD56_GNSS_GPS_CPUID, 1);
       if (ret < 0)
         {
-          goto _err2;
+          goto err2;
         }
 
 #ifndef CONFIG_CXD56_GNSS_HOT_SLEEP
@@ -2646,31 +2643,31 @@ static int cxd56_gnss_open(struct file *filep)
       ret = cxd56_gnss_wait_notify(&priv->syncsem, 5);
       if (ret < 0)
         {
-          goto _err2;
+          goto err2;
         }
 
       ret = fw_gd_writebuffer(CXD56_CPU1_DATA_TYPE_INFO, 0,
                               &priv->shared_info, sizeof(priv->shared_info));
       if (ret < 0)
         {
-          goto _err2;
+          goto err2;
         }
 
       nxsem_destroy(&priv->syncsem);
     }
 
   priv->num_open++;
-  goto _success;
+  goto success;
 
-  _err2:
+err2:
 #ifndef CONFIG_CXD56_GNSS_HOT_SLEEP
   fw_pm_sleepcpu(CXD56_GNSS_GPS_CPUID, PM_SLEEP_MODE_HOT_ENABLE);
 #endif
   fw_pm_sleepcpu(CXD56_GNSS_GPS_CPUID, PM_SLEEP_MODE_COLD);
-  _err1:
+err1:
   nxsem_destroy(&priv->syncsem);
-  _err0:
+err0:
-  _success:
+success:
   nxsem_post(&priv->devsem);
   return ret;
 }
@@ -2718,7 +2715,7 @@ static int cxd56_gnss_close(struct file *filep)
         }
     }
 
-  errout:
+errout:
   nxsem_post(&priv->devsem);
   return ret;
 }
@@ -2749,12 +2746,12 @@ static ssize_t cxd56_gnss_read(struct file *filep, char *buffer,
   if (!buffer)
     {
       ret = -EINVAL;
-      goto _err;
+      goto err;
     }
 
   if (len == 0)
     {
-      goto _success;
+      goto out;
     }
 
   /* setect data type */
@@ -2763,7 +2760,7 @@ static ssize_t cxd56_gnss_read(struct file *filep, char *buffer,
   if (type < 0)
     {
       ret = -ESPIPE;
-      goto _err;
+      goto out;
     }
 
   if (type == CXD56_CPU1_DATA_TYPE_GNSS)
@@ -2787,8 +2784,7 @@ static ssize_t cxd56_gnss_read(struct file *filep, char *buffer,
 
   ret = fw_gd_readbuffer(type, offset, buffer, len);
 
-  _err:
+out:
-  _success:
   filep->f_pos = 0;
   return ret;
 }
@@ -3023,14 +3019,14 @@ static int cxd56_gnss_register(const char *devpath)
   if (ret < 0)
     {
       gnsserr("Failed to initialize gnss devsem!\n");
-      goto _err0;
+      goto err0;
     }
 
   ret = nxsem_init(&priv->apiwait, 0, 0);
   if (ret < 0)
     {
       gnsserr("Failed to initialize gnss apiwait!\n");
-      goto _err0;
+      goto err0;
     }
 
   nxsem_set_protocol(&priv->apiwait, SEM_PRIO_NONE);
@@ -3039,21 +3035,21 @@ static int cxd56_gnss_register(const char *devpath)
   if (ret < 0)
     {
       gnsserr("Failed to initialize gnss ioctllock!\n");
-      goto _err0;
+      goto err0;
     }
 
   ret = cxd56_gnss_initialize(priv);
   if (ret < 0)
     {
       gnsserr("Failed to initialize gnss device!\n");
-      goto _err0;
+      goto err0;
     }
 
   ret = register_driver(devpath, &g_gnssfops, 0666, priv);
   if (ret < 0)
     {
       gnsserr("Failed to register driver: %d\n", ret);
-      goto _err0;
+      goto err0;
     }
 
   for (i = 0; i < sizeof(devsig_table) / sizeof(devsig_table[0]); i++)
@@ -3063,7 +3059,7 @@ static int cxd56_gnss_register(const char *devpath)
         {
           gnsserr("Failed to initialize ICC for GPS CPU: %d,%d\n", ret,
                 devsig_table[i].sigtype);
-          goto _err2;
+          goto err1;
         }
 
       cxd56_cpu1sigregisterhandler(devsig_table[i].sigtype,
@@ -3071,13 +3067,12 @@ static int cxd56_gnss_register(const char *devpath)
     }
 
   gnssinfo("GNSS driver loaded successfully!\n");
-
   return ret;
 
-  _err2:
+err1:
   unregister_driver(devpath);
 
-  _err0:
+err0:
   kmm_free(priv);
   return ret;
 }

arch/arm/src/cxd56xx/cxd56_sdhci.c

@@ -2909,6 +2909,7 @@ static int cxd56_sdio_dmarecvsetup(struct sdio_dev_s *dev,
 
   cxd56_sample(priv, SAMPLENDX_AFTER_SETUP);
   return OK;
+
 error:
 
   /* Free allocated align buffer */
@@ -3034,6 +3035,7 @@ static int cxd56_sdio_dmasendsetup(struct sdio_dev_s *dev,
   cxd56_configxfrints(priv, SDHCI_DMADONE_INTS);
 
   return OK;
+
 error:
 
   /* Free allocated align buffer */

arch/arm/src/lc823450/lc823450_dvfs2.c

@@ -579,7 +579,6 @@ void lc823450_dvfs_exit_idle(int irq)
   lc823450_dvfs_set_div(_dvfs_cur_idx, 0);
 
 exit_with_error:
-
   if (0 == _dvfs_cpu_is_active[me])
     {
       /* In case of idle to active transition

arch/arm/src/lc823450/lc823450_serial.c

@@ -1199,7 +1199,6 @@ static int up_hs_send(struct uart_dev_s *dev, const char *buf, int buflen)
   struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
 
 retry:
-
   nxsem_wait(&priv->txdma_wait);
 
   /* If buflen <= FIFO space, write it by PIO. */

arch/arm/src/lc823450/lc823450_usbdev.c

@@ -319,7 +319,6 @@ static int epbuf_write(int epnum, void *buf, size_t len)
   privep = &g_usbdev.eplist[epnum];
 
 cont:
-
   if (epnum == 0)
     {
       while (!(getreg32(USB_EPCTRL(epnum)) & USB_EPCTRL_EMPTYI) &&

arch/arm/src/phy62xx/phyplus_tim.c

@@ -519,7 +519,7 @@ struct phyplus_tim_dev_s *phyplus_tim_init(int timer)
       default:
         {
           tmrerr("ERROR: unsupported TIMER %d\n", timer);
-          goto errout;
+          return NULL;
         }
     }
 
@@ -532,11 +532,10 @@ struct phyplus_tim_dev_s *phyplus_tim_init(int timer)
   else
     {
       tmrerr("ERROR: TIMER %d is already in use\n", timer);
-      tim = NULL;
+      return NULL;
     }
 
   syslog(LOG_ERR, "phyplus_tim_init 2\n");
-  errout:
   return (struct phyplus_tim_dev_s *)tim;
 }
 

arch/arm/src/stm32/stm32_sdio.c

@@ -2647,7 +2647,6 @@ static sdio_eventset_t stm32_eventwait(struct sdio_dev_s *dev)
   /* Disable event-related interrupts */
 
 errout_with_waitints:
-
   stm32_configwaitints(priv, 0, 0, 0);
 #ifdef CONFIG_STM32_SDIO_DMA
   priv->xfrflags   = 0;

arch/arm/src/stm32f7/stm32_sdmmc.c

@@ -2904,7 +2904,6 @@ static sdio_eventset_t stm32_eventwait(struct sdio_dev_s *dev)
   /* Disable event-related interrupts */
 
 errout_with_waitints:
-
   stm32_configwaitints(priv, 0, 0, 0);
 #ifdef CONFIG_STM32F7_SDMMC_DMA
   priv->xfrflags   = 0;

arch/arm/src/stm32h7/stm32_sdmmc.c

@@ -3006,7 +3006,6 @@ static sdio_eventset_t stm32_eventwait(struct sdio_dev_s *dev)
   /* Disable event-related interrupts */
 
 errout_with_waitints:
-
   stm32_configwaitints(priv, 0, 0, 0);
 
   leave_critical_section(flags);

arch/arm/src/stm32l4/stm32l4_sdmmc.c

@@ -2673,7 +2673,6 @@ static sdio_eventset_t stm32_eventwait(struct sdio_dev_s *dev)
   /* Disable event-related interrupts */
 
 errout_with_waitints:
-
   stm32_configwaitints(priv, 0, 0, 0);
 #ifdef CONFIG_STM32L4_SDMMC_DMA
   priv->xfrflags   = 0;

arch/arm/src/tiva/common/tiva_can.c

@@ -1663,7 +1663,6 @@ int tivacan_handle_errors(struct can_dev_s *dev)
            canmod->base + TIVA_CAN_OFFSET_STS);
 
 save_regs_and_return:
-
 #endif /* CONFIG_CAN_ERRORS */
 
   /* Save contents of CANSTS and CANERR for other functions to use

arch/renesas/src/rx65n/rx65n_eth.c

@@ -3400,8 +3400,7 @@ static int rx65n_phyinit(FAR struct rx65n_ethmac_s *priv)
 
   if (count > ETHER_CFG_PHY_DELAY_RESET)
     {
-      ret = -ETIMEDOUT;
+      return -ETIMEDOUT;
-      goto error_with_reset_timeout;
     }
 
   priv->mbps100 = 0;
@@ -3434,8 +3433,7 @@ static int rx65n_phyinit(FAR struct rx65n_ethmac_s *priv)
 
   if (count > ETHER_PHY_STATUS_CHECK_DELAY)
     {
-      ret = -ETIMEDOUT;
+      return -ETIMEDOUT;
-      goto error_with_auto_neg_timeout;
     }
 
 #ifdef CONFIG_RX65N_EMAC0_PHYSR_ALTCONFIG
@@ -3463,11 +3461,9 @@ static int rx65n_phyinit(FAR struct rx65n_ethmac_s *priv)
         priv->mbps100 = 1;
         break;
     }
+#endif
+#endif
 
-#endif
-#endif
-  error_with_reset_timeout:
-  error_with_auto_neg_timeout:
   return ret;
 }
 

arch/renesas/src/rx65n/rx65n_usbhost.c

@@ -7649,8 +7649,8 @@ errout_with_xfrinfo:
   ed->xfrinfo = NULL;
   }
   while (0);
-errout_with_sem:
 
+errout_with_sem:
   /* rx65n_usbhost_givesem(&priv->exclsem); */
 
   return nbytes;

arch/risc-v/src/esp32c3/esp32c3_bignum.c

@@ -811,7 +811,6 @@ static int mpi_mult_mpi_overlong(struct esp32c3_mpi_s *Z,
 
 cleanup:
   esp32c3_mpi_free(&ztemp);
-
   return ret;
 }
 
@@ -848,6 +847,7 @@ static int mpi_mult_mpi_failover_mod_mult(struct esp32c3_mpi_s *Z,
   esp32c3_mpi_read_result_hw_op(Z, z_words);
 
   Z->s = X->s * Y->s;
+
 cleanup:
   esp32c3_mpi_disable_hardware_hw_op();
   return ret;
@@ -983,7 +983,6 @@ static int mpi_write_hlp(struct esp32c3_mpi_s *X, int radix,
   *p += length;
 
 cleanup:
-
   return ret;
 }
 
@@ -1447,7 +1446,6 @@ int esp32c3_mpi_copy(struct esp32c3_mpi_s *X,
   memcpy(X->p, Y->p, i * CIL);
 
 cleanup:
-
   return ret;
 }
 
@@ -1604,7 +1602,6 @@ int esp32c3_mpi_lset(struct esp32c3_mpi_s *X, int32_t z)
   X->s  = (z < 0) ? -1 : 1;
 
 cleanup:
-
   return ret;
 }
 
@@ -1678,7 +1675,6 @@ int esp32c3_mpi_set_bit(struct esp32c3_mpi_s *X,
   X->p[off] |= (uint32_t) val << idx;
 
 cleanup:
-
   return ret;
 }
 
@@ -1863,9 +1859,7 @@ int esp32c3_mpi_read_string(struct esp32c3_mpi_s *X,
     }
 
 cleanup:
-
   esp32c3_mpi_free(&T);
-
   return ret;
 }
 
@@ -2001,9 +1995,7 @@ int esp32c3_mpi_write_string(const struct esp32c3_mpi_s *X, int radix,
   *olen = p - buf;
 
 cleanup:
-
   esp32c3_mpi_free(&T);
-
   return ret;
 }
 
@@ -2059,7 +2051,6 @@ int esp32c3_mpi_read_binary(struct esp32c3_mpi_s *X,
     }
 
 cleanup:
-
   return ret;
 }
 
@@ -2193,7 +2184,6 @@ int esp32c3_mpi_shift_l(struct esp32c3_mpi_s *X, size_t count)
     }
 
 cleanup:
-
   return ret;
 }
 
@@ -2619,7 +2609,6 @@ int esp32c3_mpi_add_abs(struct esp32c3_mpi_s *X,
     }
 
 cleanup:
-
   return ret;
 }
 
@@ -2702,9 +2691,7 @@ int esp32c3_mpi_sub_abs(struct esp32c3_mpi_s *X,
     }
 
 cleanup:
-
   esp32c3_mpi_free(&TB);
-
   return ret;
 }
 
@@ -2755,7 +2742,6 @@ int esp32c3_mpi_add_mpi(struct esp32c3_mpi_s *X,
     }
 
 cleanup:
-
   return ret;
 }
 
@@ -2806,7 +2792,6 @@ int esp32c3_mpi_sub_mpi(struct esp32c3_mpi_s *X,
     }
 
 cleanup:
-
   return ret;
 }
 
@@ -3166,7 +3151,6 @@ int esp32c3_mpi_div_mpi(struct esp32c3_mpi_s *Q,
     }
 
 cleanup:
-
   esp32c3_mpi_free(&X); esp32c3_mpi_free(&Y); esp32c3_mpi_free(&Z);
   esp32c3_mpi_free(&T1); esp32c3_mpi_free(&T2);
 
@@ -3250,7 +3234,6 @@ int esp32c3_mpi_mod_mpi(struct esp32c3_mpi_s *R,
     }
 
 cleanup:
-
   return ret;
 }
 
@@ -3583,7 +3566,6 @@ int esp32c3_mpi_exp_mod(struct esp32c3_mpi_s *X,
     }
 
 cleanup:
-
   for (i = (one << (wsize - 1)); i < (one << wsize); i++)
     {
       esp32c3_mpi_free(&W[i]);
@@ -3673,9 +3655,7 @@ int esp32c3_mpi_gcd(struct esp32c3_mpi_s *G,
   ESP32C3_MPI_CHK(esp32c3_mpi_copy(G, &TB), cleanup);
 
 cleanup:
-
   esp32c3_mpi_free(&TG); esp32c3_mpi_free(&TA); esp32c3_mpi_free(&TB);
-
   return ret;
 }
 
@@ -3854,7 +3834,6 @@ int esp32c3_mpi_inv_mod(struct esp32c3_mpi_s *X,
   ESP32C3_MPI_CHK(esp32c3_mpi_copy(X, &V1), cleanup);
 
 cleanup:
-
   esp32c3_mpi_free(&TA);
   esp32c3_mpi_free(&TU);
   esp32c3_mpi_free(&U1);

arch/risc-v/src/esp32c3/esp32c3_rsa.c

@@ -706,7 +706,6 @@ static int esp32c3_rsa_deduce_primes(struct esp32c3_mpi_s const *N,
   ret = ESP32C3_ERR_MPI_BAD_INPUT_DATA;
 
 cleanup:
-
   esp32c3_mpi_free(&K);
   esp32c3_mpi_free(&T);
   return ret;
@@ -772,7 +771,6 @@ static int esp32c3_rsa_deduce_private_exponent(struct esp32c3_mpi_s const *P,
   ESP32C3_MPI_CHK(esp32c3_mpi_inv_mod(D, E, &K), cleanup);
 
 cleanup:
-
   esp32c3_mpi_free(&K);
   esp32c3_mpi_free(&L);
 
@@ -990,7 +988,6 @@ static int esp32c3_rsa_validate_params(const struct esp32c3_mpi_s *N,
     }
 
 cleanup:
-
   esp32c3_mpi_free(&K);
   esp32c3_mpi_free(&L);
 
@@ -1172,7 +1169,6 @@ int esp32c3_rsa_import_raw(struct esp32c3_rsa_context_s *ctx,
     }
 
 cleanup:
-
   if (ret != 0)
     {
       return (ESP32C3_ERR_RSA_BAD_INPUT_DATA + ret);
@@ -1375,7 +1371,6 @@ int esp32c3_rsa_export_raw(const struct esp32c3_rsa_context_s *ctx,
     }
 
 cleanup:
-
   return ret;
 }
 

arch/risc-v/src/esp32c3/esp32c3_spiflash_mtd.c

@@ -244,7 +244,7 @@ static ssize_t esp32c3_read(struct mtd_dev_s *dev, off_t offset,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = spi_flash_read(offset, buffer, nbytes);
@@ -260,8 +260,6 @@ static ssize_t esp32c3_read(struct mtd_dev_s *dev, off_t offset,
   finfo("%s()=%d\n", __func__, ret);
 #endif
 
-error_with_buffer:
-
   return ret;
 }
 
@@ -449,7 +447,7 @@ static ssize_t esp32c3_bread_decrypt(struct mtd_dev_s *dev,
 static ssize_t esp32c3_write(struct mtd_dev_s *dev, off_t offset,
                            size_t nbytes, const uint8_t *buffer)
 {
-  int ret;
+  ssize_t ret;
   struct esp32c3_mtd_dev_s *priv = (struct esp32c3_mtd_dev_s *)dev;
 
   ASSERT(buffer);
@@ -470,7 +468,7 @@ static ssize_t esp32c3_write(struct mtd_dev_s *dev, off_t offset,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = spi_flash_write(offset, buffer, nbytes);
@@ -486,9 +484,7 @@ static ssize_t esp32c3_write(struct mtd_dev_s *dev, off_t offset,
   finfo("%s()=%d\n", __func__, ret);
 #endif
 
-error_with_buffer:
+  return ret;
-
-  return (ssize_t)ret;
 }
 
 /****************************************************************************
@@ -582,7 +578,7 @@ static ssize_t esp32c3_bwrite_encrypt(struct mtd_dev_s *dev,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = spi_flash_write_encrypted(addr, buffer, size);
@@ -598,8 +594,6 @@ static ssize_t esp32c3_bwrite_encrypt(struct mtd_dev_s *dev,
   finfo("%s()=%d\n", __func__, ret);
 #endif
 
-error_with_buffer:
-
   return ret;
 }
 

arch/risc-v/src/esp32c3/esp32c3_tim.c

@@ -975,7 +975,7 @@ struct esp32c3_tim_dev_s *esp32c3_tim_init(int timer)
       tim = NULL;
     }
 
-  errout:
+errout:
   return (struct esp32c3_tim_dev_s *)tim;
 }
 

arch/risc-v/src/esp32c3/esp32c3_wdt.c

@@ -303,7 +303,6 @@ static int32_t esp32c3_wdt_config_stage(struct esp32c3_wdt_dev_s *dev,
                                         enum esp32c3_wdt_stage_e stage,
                                         enum esp32c3_wdt_stage_action_e cfg)
 {
-  int32_t ret = OK;
   uint32_t mask;
   DEBUGASSERT(dev);
 
@@ -380,13 +379,11 @@ static int32_t esp32c3_wdt_config_stage(struct esp32c3_wdt_dev_s *dev,
     default:
       {
         wderr("ERROR: unsupported stage %d\n", stage);
-        ret = -EINVAL;
+        return -EINVAL;
-        goto errout;
       }
   }
 
-  errout:
+  return OK;
-    return ret;
 }
 
 /****************************************************************************
@@ -608,12 +605,10 @@ static int32_t esp32c3_wdt_settimeout(struct esp32c3_wdt_dev_s *dev,
       {
         wderr("ERROR: unsupported stage %d\n", stage);
         ret = -EINVAL;
-        goto errout;
       }
   }
 
-  errout:
+  return ret;
-    return ret;
 }
 
 /****************************************************************************
@@ -948,7 +943,7 @@ struct esp32c3_wdt_dev_s *esp32c3_wdt_init(enum esp32c3_wdt_inst_e wdt_id)
       default:
         {
           wderr("ERROR: unsupported WDT %d\n", wdt_id);
-          goto errout;
+          return NULL;
         }
     }
 
@@ -959,15 +954,14 @@ struct esp32c3_wdt_dev_s *esp32c3_wdt_init(enum esp32c3_wdt_inst_e wdt_id)
   if (wdt->inuse == true)
     {
       wderr("ERROR: WDT %d is already in use\n", wdt_id);
-      wdt = NULL;
+      return NULL;
     }
   else
     {
       wdt->inuse = true;
     }
 
-  errout:
+  return (struct esp32c3_wdt_dev_s *)wdt;
-    return (struct esp32c3_wdt_dev_s *)wdt;
 }
 
 /****************************************************************************

arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c

@@ -190,15 +190,14 @@ static int esp32c3_wdt_start(struct watchdog_lowerhalf_s *lower)
     {
       /* Return EBUSY to indicate that the timer was already running */
 
-      ret = -EBUSY;
+      return -EBUSY;
-      goto errout;
     }
 
   /* If WDT was not started yet */
 
   else
     {
-      priv->started   = true;
+      priv->started = true;
 
       /* Unlock WDT */
 
@@ -253,8 +252,8 @@ static int esp32c3_wdt_start(struct watchdog_lowerhalf_s *lower)
 
       ESP32C3_WDT_LOCK(priv->wdt);
     }
-  errout:
+
-    return ret;
+  return ret;
 }
 
 /****************************************************************************
@@ -654,7 +653,6 @@ static int esp32c3_wdt_handler(int irq, void *context, void *arg)
 int esp32c3_wdt_initialize(const char *devpath, enum esp32c3_wdt_inst_e wdt)
 {
   struct esp32c3_wdt_lowerhalf_s *lower = NULL;
-  int                             ret = OK;
 
   DEBUGASSERT(devpath);
 
@@ -689,8 +687,7 @@ int esp32c3_wdt_initialize(const char *devpath, enum esp32c3_wdt_inst_e wdt)
 
       default:
         {
-          ret = -ENODEV;
+          return -ENODEV;
-          goto errout;
         }
     }
 
@@ -702,8 +699,7 @@ int esp32c3_wdt_initialize(const char *devpath, enum esp32c3_wdt_inst_e wdt)
 
   if (lower->wdt == NULL)
     {
-      ret = -EINVAL;
+      return = -EINVAL;
-      goto errout;
     }
 
   lower->started = esp32c3_wdt_is_running(lower->wdt);
@@ -738,10 +734,8 @@ int esp32c3_wdt_initialize(const char *devpath, enum esp32c3_wdt_inst_e wdt)
        * indicate the failure (implying the non-unique devpath).
        */
 
-      ret = -EEXIST;
+      return -EEXIST;
-      goto errout;
     }
 
-errout:
+  return OK;
-  return ret;
 }

arch/risc-v/src/k210/k210_start.c

@@ -136,7 +136,6 @@ void __k210_start(uint32_t mhartid)
   nx_start();
 
 cpu1:
-
   showprogress('a');
 
 #if defined(CONFIG_SMP) && (CONFIG_SMP_NCPUS == 2)

arch/risc-v/src/mpfs/mpfs_emmcsd.c

@@ -2791,7 +2791,6 @@ static sdio_eventset_t mpfs_eventwait(struct sdio_dev_s *dev)
   /* Disable event-related interrupts */
 
 errout_with_waitints:
-
   mpfs_configwaitints(priv, 0, 0, 0);
 
   leave_critical_section(flags);

arch/risc-v/src/mpfs/mpfs_ihc.c

@@ -1451,7 +1451,6 @@ int mpfs_ihc_init(void)
   return OK;
 
 init_error:
-
   up_disable_irq(g_plic_irq);
   return ret;
 }

arch/risc-v/src/qemu-rv/qemu_rv_start.c

@@ -116,7 +116,6 @@ void qemu_rv_start(int mhartid)
   nx_start();
 
 cpux:
-
 #ifdef CONFIG_SMP
   riscv_cpu_boot(mhartid);
 #endif

arch/sim/src/sim/vpnkit/protocol.c

@@ -141,6 +141,7 @@ int really_write(int fd, uint8_t *buffer, size_t total)
     }
 
   return 0;
+
 err:
 
   /* On error: stop listening to the socket */

arch/xtensa/src/esp32/esp32_spiflash.c

@@ -1541,7 +1541,7 @@ static int esp32_erase(struct mtd_dev_s *dev, off_t startblock,
 static ssize_t esp32_read(struct mtd_dev_s *dev, off_t offset,
                           size_t nbytes, uint8_t *buffer)
 {
-  int ret;
+  ssize_t ret;
   struct esp32_spiflash_s *priv = MTD2PRIV(dev);
 
 #ifdef CONFIG_ESP32_SPIFLASH_DEBUG
@@ -1553,7 +1553,7 @@ static ssize_t esp32_read(struct mtd_dev_s *dev, off_t offset,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   esp32_set_read_opt(priv);
@@ -1570,9 +1570,7 @@ static ssize_t esp32_read(struct mtd_dev_s *dev, off_t offset,
   finfo("esp32_read()=%d\n", ret);
 #endif
 
-error_with_buffer:
+  return ret;
-
-  return (ssize_t)ret;
 }
 
 /****************************************************************************
@@ -1641,7 +1639,7 @@ static ssize_t esp32_read_decrypt(struct mtd_dev_s *dev,
                                   size_t nbytes,
                                   uint8_t *buffer)
 {
-  int ret;
+  ssize_t ret;
   uint8_t *tmpbuff = buffer;
   struct esp32_spiflash_s *priv = MTD2PRIV(dev);
 
@@ -1655,7 +1653,7 @@ static ssize_t esp32_read_decrypt(struct mtd_dev_s *dev,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = esp32_readdata_encrypted(priv, offset, tmpbuff, nbytes);
@@ -1671,9 +1669,7 @@ static ssize_t esp32_read_decrypt(struct mtd_dev_s *dev,
   finfo("esp32_read_decrypt()=%d\n", ret);
 #endif
 
-error_with_buffer:
+  return ret;
-
-  return (ssize_t)ret;
 }
 
 /****************************************************************************
@@ -1741,7 +1737,7 @@ static ssize_t esp32_bread_decrypt(struct mtd_dev_s *dev,
 static ssize_t esp32_write(struct mtd_dev_s *dev, off_t offset,
                            size_t nbytes, const uint8_t *buffer)
 {
-  int ret;
+  ssize_t ret;
   struct esp32_spiflash_s *priv = MTD2PRIV(dev);
 
   ASSERT(buffer);
@@ -1760,7 +1756,7 @@ static ssize_t esp32_write(struct mtd_dev_s *dev, off_t offset,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = esp32_writedata(priv, offset, buffer, nbytes);
@@ -1776,9 +1772,7 @@ static ssize_t esp32_write(struct mtd_dev_s *dev, off_t offset,
   finfo("esp32_write()=%d\n", ret);
 #endif
 
-error_with_buffer:
+  return ret;
-
-  return (ssize_t)ret;
 }
 
 /****************************************************************************
@@ -1861,7 +1855,7 @@ static ssize_t esp32_bwrite_encrypt(struct mtd_dev_s *dev,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = esp32_writedata_encrypted(priv, addr, buffer, size);
@@ -1876,9 +1870,6 @@ static ssize_t esp32_bwrite_encrypt(struct mtd_dev_s *dev,
 #ifdef CONFIG_ESP32_SPIFLASH_DEBUG
   finfo("esp32_bwrite_encrypt()=%d\n", ret);
 #endif
-
-error_with_buffer:
-
   return ret;
 }
 

arch/xtensa/src/esp32/esp32_tim.c

@@ -767,7 +767,7 @@ struct esp32_tim_dev_s *esp32_tim_init(int timer)
       default:
         {
           tmrerr("ERROR: unsupported TIMER %d\n", timer);
-          goto errout;
+          return NULL;
         }
     }
 
@@ -780,10 +780,9 @@ struct esp32_tim_dev_s *esp32_tim_init(int timer)
   else
     {
       tmrerr("ERROR: TIMER %d is already in use\n", timer);
-      tim = NULL;
+      return NULL;
     }
 
-  errout:
   return (struct esp32_tim_dev_s *)tim;
 }
 

arch/xtensa/src/esp32/esp32_wdt.c

@@ -275,7 +275,6 @@ static int esp32_wdt_start(struct esp32_wdt_dev_s *dev)
 static int esp32_wdt_set_stg_conf(struct esp32_wdt_dev_s *dev,
                                    uint8_t stage, uint8_t conf)
 {
-  int ret = OK;
   uint32_t mask;
   DEBUGASSERT(dev);
 
@@ -376,13 +375,11 @@ static int esp32_wdt_set_stg_conf(struct esp32_wdt_dev_s *dev,
       default:
         {
           tmrerr("ERROR: unsupported stage %d\n", stage);
-          ret = EINVAL;
+          return -EINVAL;
-          goto errout;
         }
     }
 
-  errout:
+  return OK;
-    return ret;
 }
 
 /****************************************************************************
@@ -571,7 +568,6 @@ static uint16_t esp32_rtc_clk(struct esp32_wdt_dev_s *dev)
 static int esp32_wdt_settimeout(struct esp32_wdt_dev_s *dev,
                                 uint32_t value, uint8_t stage)
 {
-  int ret = OK;
   DEBUGASSERT(dev);
 
     switch (stage)
@@ -655,13 +651,11 @@ static int esp32_wdt_settimeout(struct esp32_wdt_dev_s *dev,
       default:
         {
           tmrerr("ERROR: unsupported stage %d\n", stage);
-          ret = EINVAL;
+          return EINVAL;
-          goto errout;
         }
     }
 
-  errout:
+  return OK;
-    return ret;
 }
 
 /****************************************************************************
@@ -951,7 +945,7 @@ struct esp32_wdt_dev_s *esp32_wdt_init(uint8_t wdt_id)
       default:
         {
           tmrerr("ERROR: unsupported WDT %d\n", wdt_id);
-          goto errout;
+          return NULL;
         }
     }
 
@@ -962,15 +956,14 @@ struct esp32_wdt_dev_s *esp32_wdt_init(uint8_t wdt_id)
   if (wdt->inuse == true)
     {
       tmrerr("ERROR: WDT %d is already in use\n", wdt_id);
-      wdt = NULL;
+      return NULL;
     }
   else
     {
       wdt->inuse = true;
     }
 
-  errout:
+  return (struct esp32_wdt_dev_s *)wdt;
-    return (struct esp32_wdt_dev_s *)wdt;
 }
 
 /****************************************************************************

arch/xtensa/src/esp32/esp32_wdt_lowerhalf.c

@@ -171,7 +171,6 @@ static int esp32_wdt_start(struct watchdog_lowerhalf_s *lower)
 {
   struct esp32_wdt_lowerhalf_s *priv =
     (struct esp32_wdt_lowerhalf_s *)lower;
-  int ret = OK;
   irqstate_t flags;
 
   wdinfo("Entry: started\n");
@@ -181,8 +180,7 @@ static int esp32_wdt_start(struct watchdog_lowerhalf_s *lower)
     {
       /* Return EBUSY to indicate that the timer was already running */
 
-      ret = -EBUSY;
+      return -EBUSY;
-      goto errout;
     }
 
   /* If WDT was not started yet */
@@ -237,8 +235,8 @@ static int esp32_wdt_start(struct watchdog_lowerhalf_s *lower)
 
       ESP32_WDT_LOCK(priv->wdt);
     }
-  errout:
+
-    return ret;
+  return OK;
 }
 
 /****************************************************************************

arch/xtensa/src/esp32s2/esp32s2_wdt.c

@@ -288,7 +288,6 @@ static int32_t wdt_config_stage(struct esp32s2_wdt_dev_s *dev,
                                 enum esp32s2_wdt_stage_e stage,
                                 enum esp32s2_wdt_stage_action_e cfg)
 {
-  int32_t ret = OK;
   uint32_t mask;
 
   DEBUGASSERT(dev != NULL);
@@ -362,13 +361,11 @@ static int32_t wdt_config_stage(struct esp32s2_wdt_dev_s *dev,
     default:
       {
         wderr("ERROR: unsupported stage %d\n", stage);
-        ret = -EINVAL;
+        return -EINVAL;
-        goto errout;
       }
   }
 
-  errout:
+  return OK;
-    return ret;
 }
 
 /****************************************************************************
@@ -499,8 +496,6 @@ static void wdt_pre(struct esp32s2_wdt_dev_s *dev, uint16_t pre)
 static int32_t wdt_settimeout(struct esp32s2_wdt_dev_s *dev, uint32_t value,
                               enum esp32s2_wdt_stage_e stage)
 {
-  int32_t ret = OK;
-
   DEBUGASSERT(dev != NULL);
 
   switch (stage)
@@ -568,13 +563,11 @@ static int32_t wdt_settimeout(struct esp32s2_wdt_dev_s *dev, uint32_t value,
     default:
       {
         wderr("ERROR: unsupported stage %d\n", stage);
-        ret = -EINVAL;
+        return -EINVAL;
-        goto errout;
       }
   }
 
-  errout:
+  return OK;
-    return ret;
 }
 
 /****************************************************************************
@@ -650,7 +643,6 @@ static int32_t wdt_setisr(struct esp32s2_wdt_dev_s *dev, xcpt_t handler,
           irq_detach(wdt->irq);
         }
 
-      ret = OK;
       goto errout;
     }
 
@@ -671,7 +663,6 @@ static int32_t wdt_setisr(struct esp32s2_wdt_dev_s *dev, xcpt_t handler,
       /* Associate an IRQ Number (from the WDT) to an ISR */
 
       ret = irq_attach(wdt->irq, handler, arg);
-
       if (ret != OK)
         {
           esp32s2_teardown_irq(wdt->periph, wdt->cpuint);

arch/xtensa/src/esp32s3/esp32s3_spiflash_mtd.c

@@ -248,7 +248,7 @@ static ssize_t esp32s3_read(struct mtd_dev_s *dev, off_t offset,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = spi_flash_read(offset, buffer, nbytes);
@@ -264,8 +264,6 @@ static ssize_t esp32s3_read(struct mtd_dev_s *dev, off_t offset,
   finfo("%s()=%d\n", __func__, ret);
 #endif
 
-error_with_buffer:
-
   return ret;
 }
 
@@ -429,7 +427,6 @@ static ssize_t esp32s3_bread_decrypt(struct mtd_dev_s *dev,
 #ifdef CONFIG_ESP32S3_STORAGE_MTD_DEBUG
   finfo("%s()=%d\n", __func__, ret);
 #endif
-
   return ret;
 }
 
@@ -453,7 +450,7 @@ static ssize_t esp32s3_bread_decrypt(struct mtd_dev_s *dev,
 static ssize_t esp32s3_write(struct mtd_dev_s *dev, off_t offset,
                              size_t nbytes, const uint8_t *buffer)
 {
-  int ret;
+  ssize_t ret;
   struct esp32s3_mtd_dev_s *priv = (struct esp32s3_mtd_dev_s *)dev;
 
   ASSERT(buffer);
@@ -474,7 +471,7 @@ static ssize_t esp32s3_write(struct mtd_dev_s *dev, off_t offset,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = spi_flash_write(offset, buffer, nbytes);
@@ -489,10 +486,7 @@ static ssize_t esp32s3_write(struct mtd_dev_s *dev, off_t offset,
 #ifdef CONFIG_ESP32S3_STORAGE_MTD_DEBUG
   finfo("%s()=%d\n", __func__, ret);
 #endif
-
+  return ret;
-error_with_buffer:
-
-  return (ssize_t)ret;
 }
 
 /****************************************************************************
@@ -532,7 +526,7 @@ static ssize_t esp32s3_bwrite_encrypt(struct mtd_dev_s *dev,
   ret = nxsem_wait(&g_exclsem);
   if (ret < 0)
     {
-      goto error_with_buffer;
+      return ret;
     }
 
   ret = spi_flash_write_encrypted(addr, buffer, size);
@@ -547,9 +541,6 @@ static ssize_t esp32s3_bwrite_encrypt(struct mtd_dev_s *dev,
 #ifdef CONFIG_ESP32S3_STORAGE_MTD_DEBUG
   finfo("%s()=%d\n", __func__, ret);
 #endif
-
-error_with_buffer:
-
   return ret;
 }
 

arch/xtensa/src/esp32s3/esp32s3_wdt.c

@@ -290,7 +290,6 @@ static int32_t wdt_config_stage(struct esp32s3_wdt_dev_s *dev,
                                 enum esp32s3_wdt_stage_e stage,
                                 enum esp32s3_wdt_stage_action_e cfg)
 {
-  int32_t ret = OK;
   uint32_t mask;
 
   DEBUGASSERT(dev != NULL);
@@ -364,13 +363,11 @@ static int32_t wdt_config_stage(struct esp32s3_wdt_dev_s *dev,
     default:
       {
         wderr("ERROR: unsupported stage %d\n", stage);
-        ret = -EINVAL;
+        return -EINVAL;
-        goto errout;
       }
   }
 
-  errout:
+  return OK;
-    return ret;
 }
 
 /****************************************************************************
@@ -501,8 +498,6 @@ static void wdt_pre(struct esp32s3_wdt_dev_s *dev, uint16_t pre)
 static int32_t wdt_settimeout(struct esp32s3_wdt_dev_s *dev, uint32_t value,
                               enum esp32s3_wdt_stage_e stage)
 {
-  int32_t ret = OK;
-
   DEBUGASSERT(dev != NULL);
 
   switch (stage)
@@ -570,13 +565,11 @@ static int32_t wdt_settimeout(struct esp32s3_wdt_dev_s *dev, uint32_t value,
     default:
       {
         wderr("ERROR: unsupported stage %d\n", stage);
-        ret = -EINVAL;
+        return -EINVAL;
-        goto errout;
       }
   }
 
-  errout:
+  return OK;
-    return ret;
 }
 
 /****************************************************************************
@@ -652,7 +645,6 @@ static int32_t wdt_setisr(struct esp32s3_wdt_dev_s *dev, xcpt_t handler,
           irq_detach(wdt->irq);
         }
 
-      ret = OK;
       goto errout;
     }
 
@@ -675,7 +667,6 @@ static int32_t wdt_setisr(struct esp32s3_wdt_dev_s *dev, xcpt_t handler,
       /* Associate an IRQ Number (from the WDT) to an ISR */
 
       ret = irq_attach(wdt->irq, handler, arg);
-
       if (ret != OK)
         {
           esp32s3_teardown_irq(wdt->cpu, wdt->periph, wdt->cpuint);

arch/xtensa/src/esp32s3/esp32s3_wdt_lowerhalf.c

@@ -182,7 +182,6 @@ static int wdt_lh_start(struct watchdog_lowerhalf_s *lower)
 {
   struct esp32s3_wdt_lowerhalf_s *priv =
     (struct esp32s3_wdt_lowerhalf_s *)lower;
-  int ret = OK;
 
   wdinfo("Entry: wdt_lh_start\n");
 
@@ -192,8 +191,7 @@ static int wdt_lh_start(struct watchdog_lowerhalf_s *lower)
     {
       /* Return EBUSY to indicate that the timer was already running */
 
-      ret = -EBUSY;
+      return -EBUSY;
-      goto errout;
     }
 
   /* If WDT was not started yet */
@@ -253,8 +251,7 @@ static int wdt_lh_start(struct watchdog_lowerhalf_s *lower)
       ESP32S3_WDT_LOCK(priv->wdt);
     }
 
-  errout:
+    return OK;
-    return ret;
 }
 
 /****************************************************************************

boards/arm/stm32/stm32f4discovery/src/stm32_cs43l22.c

@@ -371,7 +371,6 @@ int stm32_cs43l22_initialize(int minor)
 errout_with_pcm:
 errout_with_cs43l22:
 errout_with_irq:
-
 #if 0
   irq_detach(IRQ_INT_CS43L22);
 errout_with_i2s:

boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c

@@ -187,7 +187,7 @@ int stm32l4_bringup(void)
                               mtd_part, partref);
 #endif
 
-  process_next_part:
+process_next_part:
 
               /* Update the pointer to point to the next size in the list */
 

drivers/audio/cxd56_src.c

@@ -147,9 +147,7 @@ static struct ap_buffer_s *cxd56_src_get_apb(void)
   src_apb->flags = 0;
 
 errorout_with_lock:
-
   spin_unlock_irqrestore(NULL, flags);
-
   return src_apb;
 }
 

drivers/ioexpander/tca64xx.c

@@ -1232,7 +1232,6 @@ static void tca64_irqworker(void *arg)
     }
 
 errout_with_restart:
-
 #ifdef CONFIG_TCA64XX_INT_POLL
   /* Check for pending interrupts */
 

drivers/mtd/smart.c

@@ -1323,7 +1323,6 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
    */
 
 errexit:
-
 #ifndef CONFIG_MTD_SMART_MINIMIZE_RAM
   if (dev->smap)
     {
@@ -4975,8 +4974,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
     {
       ferr("ERROR: Logical sector %d too large\n", req->logsector);
 
-      ret = -EINVAL;
+      return -EINVAL;
-      goto errout;
     }
 
 #ifndef CONFIG_MTD_SMART_MINIMIZE_RAM
@@ -4987,8 +4985,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
   if (physsector == 0xffff)
     {
       ferr("ERROR: Logical sector %d not allocated\n", req->logsector);
-      ret = -EINVAL;
+      return -EINVAL;
-      goto errout;
     }
 
 #ifdef CONFIG_MTD_SMART_ENABLE_CRC
@@ -5004,8 +5001,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
       /* TODO:  Mark the block bad */
 
       ferr("ERROR: Error reading phys sector %d\n", physsector);
-      ret = -EIO;
+      return -EIO;
-      goto errout;
     }
 
 #if SMART_STATUS_VERSION == 1
@@ -5031,8 +5027,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
 
           ferr("ERROR: Error validating sector %d CRC during read\n",
                physsector);
-          ret = -EIO;
+          return -EIO;
-          goto errout;
         }
     }
 
@@ -5052,8 +5047,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
   if (ret != sizeof(struct smart_sect_header_s))
     {
       ferr("ERROR: Error reading sector %d header\n", physsector);
-      ret = -EIO;
+      return -EIO;
-      goto errout;
     }
 
   /* Do a sanity check on the header data */
@@ -5066,8 +5060,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
 
       ferr("ERROR: Error in logical sector %d header, phys=%d\n",
           req->logsector, physsector);
-      ret = -EIO;
+      return -EIO;
-      goto errout;
     }
 
   /* Read the sector data into the buffer */
@@ -5081,14 +5074,10 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
   if (ret != req->count)
     {
       ferr("ERROR: Error reading phys sector %d\n", physsector);
-      ret = -EIO;
+      return -EIO;
-      goto errout;
     }
-
 #endif
 
-errout:
-
   return ret;
 }
 

drivers/sensors/fakesensor.c

@@ -184,7 +184,8 @@ static inline void fakesensor_read_gps(FAR struct fakesensor_s *sensor)
   float altitude;
   char raw[150];
   memset(&gps, 0, sizeof(struct sensor_gps));
-  read:
+
+read:
   fakesensor_read_csv_line(
           &sensor->data, raw, sizeof(raw), sensor->raw_start);
   FAR char *pos = strstr(raw, "GGA");

drivers/sensors/lps25h.c

@@ -420,7 +420,6 @@ static ssize_t lps25h_read(FAR struct file *filep, FAR char *buffer,
     }
 
 out:
-
   nxsem_post(&dev->devsem);
   return length;
 }

drivers/sensors/max44009.c

@@ -849,7 +849,6 @@ static int max44009_poll(FAR struct file *filep, FAR struct pollfd *fds,
     }
 
 out:
-
   nxsem_post(&priv->dev_sem);
   return ret;
 }

drivers/syslog/syslog_filechannel.c

@@ -120,7 +120,6 @@ static void log_rotate(FAR const char *log_file)
   rename(log_file, rotate_to);
 
 end:
-
   kmm_free(rotate_to);
   kmm_free(rotate_from);
 }

drivers/usbhost/usbhost_xboxcontroller.c

@@ -891,7 +891,6 @@ static int usbhost_xboxcontroller_poll(int argc, char *argv[])
     }
 
 exitloop:
-
   /* We get here when the driver is removed, when too many errors have
    * been encountered, or when the thread is canceled.
    *

drivers/wireless/bluetooth/bt_uart_bcm4343x.c

@@ -368,7 +368,7 @@ static int load_bcm4343x_firmware(FAR const struct btuart_lowerhalf_s *lower)
       ret = -ECOMM;
     }
 
-  load_bcm4343x_firmware_finished:
+load_bcm4343x_firmware_finished:
   lower->rxenable(lower, false);
   lower->rxattach(lower, NULL, NULL);
 

drivers/wireless/gs2200m.c

@@ -671,7 +671,6 @@ static bool _copy_data_from_pkt(FAR struct gs2200m_dev_s *dev,
     }
 
 errout:
-
   if (!msg->is_tcp)
     {
       /* Copy the source address and port */
@@ -1014,7 +1013,6 @@ enum spi_status_e gs2200m_hal_read(FAR struct gs2200m_dev_s *dev,
                                    FAR uint8_t *data,
                                    FAR uint16_t *len)
 {
-  enum spi_status_e r = SPI_OK;
   uint8_t hdr[8];
   int i;
 
@@ -1035,8 +1033,7 @@ enum spi_status_e gs2200m_hal_read(FAR struct gs2200m_dev_s *dev,
   if (HAL_TIMEOUT == i)
     {
       wlerr("***** error: timeout!\n");
-      r = SPI_TIMEOUT;
+      return SPI_TIMEOUT;
-      goto errout;
     }
 
   /* Send READ_REQUEST then receive READ_RESPONSE
@@ -1058,9 +1055,7 @@ enum spi_status_e gs2200m_hal_read(FAR struct gs2200m_dev_s *dev,
   /* Read the actual data */
 
   _read_data(dev, data, *len);
-
+  return SPI_OK;
-errout:
-  return r;
 }
 
 /****************************************************************************
@@ -1509,7 +1504,6 @@ static enum pkt_type_e gs2200m_send_cmd(FAR struct gs2200m_dev_s *dev,
   wlinfo("+++ cmd=%s", cmd);
 
 retry:
-
   s = gs2200m_hal_write(dev, cmd, strlen(cmd));
   r = _spi_err_to_pkt_type(s);
 
@@ -1519,7 +1513,6 @@ retry:
     }
 
 retry_recv:
-
   r = gs2200m_recv_pkt(dev, pkt_dat);
 
   if ((TYPE_BULK_DATA_TCP == r || TYPE_BULK_DATA_UDP == r) && pkt_dat)
@@ -1558,7 +1551,6 @@ retry_recv:
     }
 
 errout:
-
   if (bulk)
     {
       wlwarn("*** Normal response r=%d\n", r);
@@ -1567,7 +1559,6 @@ errout:
   /* Enable gs2200m irq again */
 
   dev->lower->enable();
-
   return r;
 }
 
@@ -2304,7 +2295,6 @@ static int gs2200m_ioctl_bind(FAR struct gs2200m_dev_s *dev,
     }
 
 retry:
-
   snprintf(port_str, sizeof(port_str), "%d", port);
 
   /* Start TCP/UDP server and retrieve cid */
@@ -2329,12 +2319,10 @@ retry:
   _check_pkt_q_empty(dev, cid);
 
 errout:
-
   msg->type = type;
   msg->cid  = cid;
 
   wlinfo("+++ end: type=%d (cid=%c)\n", type, cid);
-
   return ret;
 }
 
@@ -2434,7 +2422,6 @@ static int gs2200m_ioctl_send(FAR struct gs2200m_dev_s *dev,
   msg->type = type;
 
 errout:
-
   if (type != TYPE_OK && type != TYPE_DISCONNECT)
     {
       ret = -EINVAL;
@@ -2446,7 +2433,6 @@ errout:
 
   wlinfo("+++ end: cid=%c len=%d type=%d\n",
          msg->cid, msg->len, type);
-
   return ret;
 }
 
@@ -2502,14 +2488,12 @@ static int gs2200m_ioctl_recv(FAR struct gs2200m_dev_s *dev,
   _control_pkt_q(dev);
 
 errout:
-
 #ifdef USE_LED
   gs2200m_set_gpio(dev, LED_GPIO, 0);
 #endif
 
   wlinfo("+++ end: cid=%c len=%d type=%d ret=%d\n",
          msg->cid, msg->len, msg->type, ret);
-
   return ret;
 }
 
@@ -2553,7 +2537,6 @@ errout:
   _control_pkt_q(dev);
 
   wlinfo("++ end: cid=%c type=%d\n", msg->cid, type);
-
   return ret;
 }
 
@@ -2627,7 +2610,6 @@ static int gs2200m_ioctl_accept(FAR struct gs2200m_dev_s *dev,
 
 errout:
   wlinfo("+++ end: type=%d (msg->cid=%c)\n", msg->type, msg->cid);
-
   return ret;
 }
 
@@ -2971,16 +2953,13 @@ static int gs2200m_ioctl_name(FAR struct gs2200m_dev_s *dev,
                               FAR struct gs2200m_name_msg *msg)
 {
   enum pkt_type_e r;
-  int ret = 0;
 
   /* Obtain connection status */
 
   r = gs2200m_get_cstatus(dev, msg);
-
   if (r != TYPE_OK)
     {
-      ret = -EINVAL;
+      return -EINVAL;
-      goto errout;
     }
 
   if (msg->local)
@@ -2993,9 +2972,7 @@ static int gs2200m_ioctl_name(FAR struct gs2200m_dev_s *dev,
              );
     }
 
-errout:
+  return 0;
-
-  return ret;
 }
 
 /****************************************************************************
@@ -3233,7 +3210,6 @@ static void gs2200m_irq_worker(FAR void *arg)
   while (ret < 0);
 
 repeat:
-
   n = dev->lower->dready(&ec);
   wlinfo("== start (dready=%d, ec=%d)\n", n, ec);
 
@@ -3354,7 +3330,6 @@ repeat:
   over = _control_pkt_q(dev);
 
 errout:
-
   if (ignored)
     {
       _release_pkt_dat(dev, pkt_dat);
@@ -3375,7 +3350,6 @@ errout:
   /* NOTE: Enable gs2200m irq which was disabled in gs2200m_irq() */
 
   dev->lower->enable();
-
   gs2200m_unlock(dev);
 }
 

drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c

@@ -751,7 +751,6 @@ process_next_bss:
     }
 
 wl_escan_result_processed:
-
   if (status == WLC_E_STATUS_PARTIAL)
     {
       /* More frames to come */

drivers/wireless/ieee80211/bcm43xxx/bcmf_gspi.c

@@ -893,7 +893,6 @@ static int bcmf_bus_gspi_initialize(FAR struct bcmf_dev_s  *priv,
   return OK;
 
 exit_free_bus:
-
   wlinfo("failed.\n");
 
   kmm_free(gbus);

drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c

@@ -730,7 +730,6 @@ errout_in_wl_active:
   bcmf_wl_active(priv, false);
 
 errout_in_critical_section:
-
   leave_critical_section(flags);
 
   wlinfo("bcmf_ifup done: %d\n", ret);

drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c

@@ -365,7 +365,6 @@ int bcmf_probe(FAR struct bcmf_sdio_dev_s *sbus)
   return OK;
 
 exit_error:
-
   wlerr("ERROR: failed to probe device %d\n", sbus->minor);
   return ret;
 }

drivers/wireless/ieee802154/mrf24j40/mrf24j40_interrupt.c

@@ -261,7 +261,6 @@ static void mrf24j40_irqwork_rx(FAR struct mrf24j40_radio_s *dev)
   dev->radiocb->rxframe(dev->radiocb, ind);
 
 done:
-
   /* Enable reception of next packet by flushing the fifo.
    * This is an MRF24J40 errata (no. 1).
    */