From 1df0147a2b503663431f9873b928ca5fceaf5cad Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Fri, 28 Sep 2018 11:47:44 +0900
Subject: [PATCH] F3: use ADC device from PG

---
 src/main/drivers/adc_stm32f30x.c | 5 +++--
 src/main/drivers/adc_stm32f4xx.c | 3 ++-
 src/main/drivers/adc_stm32f7xx.c | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/drivers/adc_stm32f30x.c b/src/main/drivers/adc_stm32f30x.c
index 81eb6e6c4a..e6f536c0a0 100644
--- a/src/main/drivers/adc_stm32f30x.c
+++ b/src/main/drivers/adc_stm32f30x.c
@@ -118,9 +118,10 @@ void adcInit(const adcConfig_t *config)
         adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag;  //CURRENT_METER_ADC_CHANNEL;
     }
 
-    ADCDevice device = adcDeviceByInstance(ADC_INSTANCE);
-    if (device == ADCINVALID)
+    ADCDevice device = ADC_CFG_TO_DEV(config->device);
+    if (device == ADCINVALID) {
         return;
+    }
 
 #ifdef ADC24_DMA_REMAP
     SYSCFG_DMAChannelRemapConfig(SYSCFG_DMARemap_ADC2ADC4, ENABLE);
diff --git a/src/main/drivers/adc_stm32f4xx.c b/src/main/drivers/adc_stm32f4xx.c
index c247384f5b..f3340f4484 100644
--- a/src/main/drivers/adc_stm32f4xx.c
+++ b/src/main/drivers/adc_stm32f4xx.c
@@ -211,8 +211,9 @@ void adcInit(const adcConfig_t *config)
     }
 
     ADCDevice device = ADC_CFG_TO_DEV(config->device);
-    if (device == ADCINVALID)
+    if (device == ADCINVALID) {
         return;
+    }
 
     adcDevice_t adc = adcHardware[device];
 
diff --git a/src/main/drivers/adc_stm32f7xx.c b/src/main/drivers/adc_stm32f7xx.c
index 83dc3e573d..255e61061d 100644
--- a/src/main/drivers/adc_stm32f7xx.c
+++ b/src/main/drivers/adc_stm32f7xx.c
@@ -237,8 +237,9 @@ void adcInit(const adcConfig_t *config)
     }
 
     ADCDevice device = adcDeviceByInstance(ADC_INSTANCE);
-    if (device == ADCINVALID)
+    if (device == ADCINVALID) {
         return;
+    }
 
     adc = adcHardware[device];