diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c
index 01462d3b9..472b1c15e 100644
--- a/os/hal/platforms/STM32/pwm_lld.c
+++ b/os/hal/platforms/STM32/pwm_lld.c
@@ -392,7 +392,7 @@ void pwm_lld_stop(PWMDriver *pwmp) {
       RCC->APB1ENR &= ~RCC_APB1ENR_TIM3EN;
     }
 #endif
-#if USE_STM32_PWM2
+#if USE_STM32_PWM4
     if (&PWMD4 == pwmp) {
       NVICDisableVector(TIM4_IRQn);
       RCC->APB1ENR &= ~RCC_APB1ENR_TIM4EN;
diff --git a/os/hal/src/adc.c b/os/hal/src/adc.c
index 86a55edfb..ee5db261e 100644
--- a/os/hal/src/adc.c
+++ b/os/hal/src/adc.c
@@ -121,11 +121,10 @@ void adcStop(ADCDriver *adcp) {
  * @brief   Starts an ADC conversion.
  * @details Starts a conversion operation, there are two kind of conversion
  *          modes:
- *          - <b>LINEAR</b>, this mode is activated when the @p callback
- *            parameter is set to @p NULL, in this mode the buffer is filled
- *            once and then the conversion stops automatically.
- *          - <b>CIRCULAR</b>, when a callback function is defined the
- *            conversion never stops and the buffer is filled circularly.
+ *          - <b>LINEAR</b>, in this mode the buffer is filled once and then
+ *            the conversion stops automatically.
+ *          - <b>CIRCULAR</b>, in this mode the conversion never stops and
+ *            the buffer is filled circularly.<br>
  *            During the conversion the callback function is invoked when
  *            the buffer is 50% filled and when the buffer is 100% filled,
  *            this way is possible to process the conversion stream in real
@@ -142,7 +141,8 @@ void adcStop(ADCDriver *adcp) {
  * @param[out] samples  pointer to the samples buffer
  * @param[in] depth     buffer depth (matrix rows number). The buffer depth
  *                      must be one or an even number.
- * @param[in] callback  pointer to the conversion callback function
+ * @param[in] callback  pointer to the conversion callback function, this
+ *                      parameter can be @p NULL if a callback is not required
  * @return              The operation status.
  * @retval FALSE        the conversion has been started.
  * @retval TRUE         the driver is busy, conversion not started.
diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.h b/os/ports/GCC/ARMCMx/chcore_v6m.h
index 756142c0e..afe6fd5b7 100644
--- a/os/ports/GCC/ARMCMx/chcore_v6m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v6m.h
@@ -166,16 +166,14 @@ struct intctx {
  * @note    @p id can be a function name or a vector number depending on the
  *          port implementation.
  */
-#define PORT_IRQ_HANDLER(id)                                                \
-  __attribute__((interrupt("IRQ"))) void id(void)
+#define PORT_IRQ_HANDLER(id) void id(void)
 
 /**
  * @brief   Fast IRQ handler function declaration.
  * @note    @p id can be a function name or a vector number depending on the
  *          port implementation.
  */
-#define PORT_FAST_IRQ_HANDLER(id)                                           \
-  __attribute__((interrupt("IRQ"))) void id(void)
+#define PORT_FAST_IRQ_HANDLER(id) void id(void)
 
 /**
  * @brief   Port-related initialization code.
diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h
index 30873796d..424422d7f 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.h
@@ -140,16 +140,14 @@ struct intctx {
  * @note    @p id can be a function name or a vector number depending on the
  *          port implementation.
  */
-#define PORT_IRQ_HANDLER(id)                                                \
-  __attribute__((interrupt("IRQ"))) void id(void)
+#define PORT_IRQ_HANDLER(id) void id(void)
 
 /**
  * @brief   Fast IRQ handler function declaration.
  * @note    @p id can be a function name or a vector number depending on the
  *          port implementation.
  */
-#define PORT_FAST_IRQ_HANDLER(id)                                           \
-  __attribute__((interrupt("IRQ"))) void id(void)
+#define PORT_FAST_IRQ_HANDLER(id) void id(void)
 
 /**
  * @brief   Port-related initialization code.