General clean-up and removal of dead code.

5 files changed, 7 insertions, 60 deletions

diff --git a/embassy-stm32/src/exti.rs b/embassy-stm32/src/exti.rs
index 0ee93bede..90d4afd56 100644
--- a/embassy-stm32/src/exti.rs
+++ b/embassy-stm32/src/exti.rs
@@ -212,31 +212,6 @@ impl_exti!(EXTI13, 13);
 impl_exti!(EXTI14, 14);
 impl_exti!(EXTI15, 15);
 
-pub(crate) unsafe fn init() {}
-
-/*
-macro_rules! impl_exti_irq {
-    ($($e:ident),+) => {
-        /// safety: must be called only once
-        pub(crate) unsafe fn init_exti() {
-            use embassy::interrupt::Interrupt;
-            use embassy::interrupt::InterruptExt;
-
-            $(
-                crate::interrupt::$e::steal().enable();
-            )+
-        }
-
-        $(
-            #[crate::interrupt]
-            unsafe fn $e() {
-                crate::exti::on_irq()
-            }
-        )+
-    };
-}
- */
-
 macro_rules! foreach_exti_irq {
     ($action:ident) => {
         crate::pac::interrupts!(
@@ -278,7 +253,7 @@ macro_rules! enable_irq {
 }
 
 /// safety: must be called only once
-pub(crate) unsafe fn init_exti() {
+pub(crate) unsafe fn init() {
     use embassy::interrupt::Interrupt;
     use embassy::interrupt::InterruptExt;
 
diff --git a/embassy-stm32/src/i2c/mod.rs b/embassy-stm32/src/i2c/mod.rs
index abda196a7..0f9414c53 100644
--- a/embassy-stm32/src/i2c/mod.rs
+++ b/embassy-stm32/src/i2c/mod.rs
@@ -40,13 +40,13 @@ pub trait SdaPin<T: Instance>: sealed::SdaPin<T> + 'static {}
 
 crate::pac::peripherals!(
     (i2c, $inst:ident) => {
-        impl crate::i2c::sealed::Instance for peripherals::$inst {
+        impl sealed::Instance for peripherals::$inst {
             fn regs() -> &'static crate::pac::i2c::I2c {
                 &crate::pac::$inst
             }
         }
 
-        impl crate::i2c::Instance for peripherals::$inst {}
+        impl Instance for peripherals::$inst {}
 
     };
 );
diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs
index 54d46c5b9..c205bc49d 100644
--- a/embassy-stm32/src/lib.rs
+++ b/embassy-stm32/src/lib.rs
@@ -83,7 +83,7 @@ pub fn init(config: Config) -> Peripherals {
 
         #[cfg(dma)]
         dma::init();
-        exti::init_exti();
+        exti::init();
         rcc::init(config.rcc);
     }
 
diff --git a/embassy-stm32/src/rng.rs b/embassy-stm32/src/rng.rs
index 4dd26c671..704f1a97b 100644
--- a/embassy-stm32/src/rng.rs
+++ b/embassy-stm32/src/rng.rs
@@ -185,31 +185,3 @@ crate::pac::interrupts!(
         irq!(HASH_RNG);
     };
 );
-
-/*
-macro_rules! impl_rng {
-    ($inst:ident, $irq:ident) => {
-        impl crate::rng::sealed::Instance for peripherals::RNG {
-            fn regs() -> crate::pac::rng::Rng {
-                crate::pac::RNG
-            }
-        }
-
-        impl crate::rng::Instance for peripherals::RNG {}
-
-        mod rng_irq {
-            use crate::interrupt;
-
-            #[interrupt]
-            unsafe fn $irq() {
-                let bits = $crate::pac::RNG.sr().read();
-                if bits.drdy() || bits.seis() || bits.ceis() {
-                    $crate::pac::RNG.cr().write(|reg| reg.set_ie(false));
-                    $crate::rng::RNG_WAKER.wake();
-                }
-            }
-        }
-    };
-}
-
- */
diff --git a/embassy-stm32/src/sdmmc/v2.rs b/embassy-stm32/src/sdmmc/v2.rs
index 6d21091a9..2c7f8ac00 100644
--- a/embassy-stm32/src/sdmmc/v2.rs
+++ b/embassy-stm32/src/sdmmc/v2.rs
@@ -1476,7 +1476,7 @@ crate::pac::peripherals!(
             type Interrupt = crate::interrupt::$inst;
 
             fn inner() -> SdmmcInner {
-                const INNER: crate::sdmmc::SdmmcInner = crate::sdmmc::SdmmcInner(crate::pac::$inst);
+                const INNER: SdmmcInner = SdmmcInner(crate::pac::$inst);
                 INNER
             }
 
@@ -1492,11 +1492,11 @@ crate::pac::peripherals!(
 
 macro_rules! impl_pin {
     ($inst:ident, $pin:ident, $signal:ident, $af:expr) => {
-        impl crate::sdmmc::sealed::$signal<peripherals::$inst> for peripherals::$pin {
+        impl sealed::$signal<peripherals::$inst> for peripherals::$pin {
             const AF_NUM: u8 = $af;
         }
 
-        impl crate::sdmmc::$signal<peripherals::$inst> for peripherals::$pin {}
+        impl $signal<peripherals::$inst> for peripherals::$pin {}
     };
 }