From df5a8d09eb5beb591987e57684671abe376cff35 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 28 Apr 2019 06:46:48 -0600 Subject: [PATCH] Trivial changes from review of last PR --- configs/nucleo-h743zi/src/nucleo-h743zi.h | 2 ++ configs/nucleo-h743zi/src/stm32_pca9635.c | 5 ++--- configs/nucleo-h743zi/src/stm32_ssd1306.c | 1 + configs/stm32f103-minimum/src/stm32_ssd1306.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/nucleo-h743zi/src/nucleo-h743zi.h b/configs/nucleo-h743zi/src/nucleo-h743zi.h index f9812324d16..afe775daf50 100644 --- a/configs/nucleo-h743zi/src/nucleo-h743zi.h +++ b/configs/nucleo-h743zi/src/nucleo-h743zi.h @@ -210,6 +210,7 @@ void stm32_usbinitialize(void); * * Description: * Initialize I2C-based LSM6DSL. + * ****************************************************************************/ #ifdef CONFIG_SENSORS_LSM303AGR @@ -221,6 +222,7 @@ int stm32_lsm6dsl_initialize(char *devpath); * * Description: * Initialize I2C-based LSM303AGR. + * ****************************************************************************/ #ifdef CONFIG_SENSORS_LSM6DSL diff --git a/configs/nucleo-h743zi/src/stm32_pca9635.c b/configs/nucleo-h743zi/src/stm32_pca9635.c index 386c28ae98f..1d415a394d4 100644 --- a/configs/nucleo-h743zi/src/stm32_pca9635.c +++ b/configs/nucleo-h743zi/src/stm32_pca9635.c @@ -74,7 +74,6 @@ int stm32_pca9635_initialize(void) { - FAR struct i2c_master_s *i2c; int ret; @@ -83,7 +82,7 @@ int stm32_pca9635_initialize(void) i2c = stm32_i2cbus_initialize(PCA9635_I2CBUS); if (!i2c) { - _err("ERROR: Failed to initialize I2C%d\n", PCA9635_I2CBUS); + i2cerr("ERROR: Failed to initialize I2C%d\n", PCA9635_I2CBUS); return -1; } @@ -91,7 +90,7 @@ int stm32_pca9635_initialize(void) if (ret < 0) { snerr("ERROR: Failed to register PCA9635 driver: %d\n", ret); - return ret; + return ret; } return OK; diff --git a/configs/nucleo-h743zi/src/stm32_ssd1306.c b/configs/nucleo-h743zi/src/stm32_ssd1306.c index 7c61546d8f1..cd52bc3c049 100644 --- a/configs/nucleo-h743zi/src/stm32_ssd1306.c +++ b/configs/nucleo-h743zi/src/stm32_ssd1306.c @@ -52,6 +52,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Configuration ************************************************************/ #ifndef CONFIG_LCD_MAXPOWER diff --git a/configs/stm32f103-minimum/src/stm32_ssd1306.c b/configs/stm32f103-minimum/src/stm32_ssd1306.c index 9ca05e61137..24eb5edc1cc 100644 --- a/configs/stm32f103-minimum/src/stm32_ssd1306.c +++ b/configs/stm32f103-minimum/src/stm32_ssd1306.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/stm32f103-minimum/src/stm32_ssd1306.c + * config/stm32f103-minimum/src/stm32_ssd1306.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt