diff --git a/esp-hal/src/analog/adc/esp32.rs b/esp-hal/src/analog/adc/esp32.rs
index e3a0b9b98..d9200235f 100644
--- a/esp-hal/src/analog/adc/esp32.rs
+++ b/esp-hal/src/analog/adc/esp32.rs
@@ -194,9 +194,7 @@ impl RegisterAccess for ADC2 {
 /// Analog-to-Digital Converter peripheral driver.
 pub struct ADC<'d, ADC> {
     _adc: PeripheralRef<'d, ADC>,
-    #[allow(dead_code)] // FIXME
     attenuations: [Option<Attenuation>; NUM_ATTENS],
-    #[allow(dead_code)] // FIXME
     active_channel: Option<u8>,
 }
 
diff --git a/esp-hal/src/analog/adc/riscv.rs b/esp-hal/src/analog/adc/riscv.rs
index ad6cc95a6..672da8ae3 100644
--- a/esp-hal/src/analog/adc/riscv.rs
+++ b/esp-hal/src/analog/adc/riscv.rs
@@ -399,9 +399,7 @@ impl super::CalibrationAccess for crate::peripherals::ADC2 {
 /// Analog-to-Digital Converter peripheral driver.
 pub struct ADC<'d, ADCI> {
     _adc: PeripheralRef<'d, ADCI>,
-    #[allow(dead_code)] // FIXME
     attenuations: [Option<Attenuation>; NUM_ATTENS],
-    #[allow(dead_code)] // FIXME
     active_channel: Option<u8>,
 }
 
diff --git a/esp-hal/src/rtc_cntl/rtc/esp32c6.rs b/esp-hal/src/rtc_cntl/rtc/esp32c6.rs
index ba4e6cf2d..2f888ed29 100644
--- a/esp-hal/src/rtc_cntl/rtc/esp32c6.rs
+++ b/esp-hal/src/rtc_cntl/rtc/esp32c6.rs
@@ -303,7 +303,6 @@ fn modem_lpcon_ll_set_wifi_lpclk_divisor_value(divider: u16) {
 }
 
 fn modem_clock_hal_enable_wifipwr_clock(enable: bool) {
-    // FIXME: esp-idf uses refcounting here for later revisions.
     unsafe {
         modem_lpcon()
             .clk_conf()
diff --git a/esp-hal/src/soc/esp32h2/gpio.rs b/esp-hal/src/soc/esp32h2/gpio.rs
index 64cdfc72e..94af18b5d 100644
--- a/esp-hal/src/soc/esp32h2/gpio.rs
+++ b/esp-hal/src/soc/esp32h2/gpio.rs
@@ -256,7 +256,6 @@ pub enum OutputSignal {
     GPIO             = 128,
 }
 
-// FIXME: add alternate function numbers/signals where necessary
 crate::gpio::gpio! {
     (0, 0, InputOutputAnalog (2 => FSPIQ) (2 => FSPIQ))
     (1, 0, InputOutputAnalog (2 => FSPICS0) (2 => FSPICS0))