From: Marek Vasut Date: Fri, 22 Apr 2022 13:41:42 +0000 (+0200) Subject: led: Drop led_default_state() X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=69245e406e919012d45d40f045f9b7369086ce17;p=u-boot.git led: Drop led_default_state() This function is empty, drop it. Signed-off-by: Marek Vasut Cc: Patrice Chotard Cc: Patrick Delaunay Cc: Sean Anderson Cc: Simon Glass Cc: Steven Lawrance Reviewed-by: Patrice Chotard --- diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index 19af59606d..514cb60d5b 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -418,7 +418,6 @@ int board_late_init(void) int x, y; int ret; - led_default_state(); splash_get_pos(&x, &y); bmp_display((ulong)&bmp_logo_bitmap[0], x, y); diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c index 105b75e65e..68f2744610 100644 --- a/board/bosch/guardian/board.c +++ b/board/bosch/guardian/board.c @@ -327,9 +327,6 @@ int board_late_init(void) int ret; struct udevice *cdev; -#ifdef CONFIG_LED_GPIO - led_default_state(); -#endif set_bootmode_env(); ret = uclass_get_device(UCLASS_PANEL, 0, &cdev); diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c index f44afb01e2..67273f9099 100644 --- a/board/dhelectronics/dh_stm32mp1/board.c +++ b/board/dhelectronics/dh_stm32mp1/board.c @@ -607,9 +607,6 @@ int board_init(void) board_init_fmc2(); - if (CONFIG_IS_ENABLED(LED)) - led_default_state(); - return 0; } diff --git a/board/gardena/smart-gateway-at91sam/board.c b/board/gardena/smart-gateway-at91sam/board.c index 3f402cfeee..c6eb11e932 100644 --- a/board/gardena/smart-gateway-at91sam/board.c +++ b/board/gardena/smart-gateway-at91sam/board.c @@ -24,9 +24,6 @@ int board_late_init(void) { at91_prepare_cpu_var(); - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - return 0; } diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index 8a3a6e3482..aa833a030f 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -183,9 +183,6 @@ err_free: int board_late_init(void) { - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - factory_data_env_config(); return 0; diff --git a/board/gateworks/venice/venice.c b/board/gateworks/venice/venice.c index 4290a69807..f1efabb203 100644 --- a/board/gateworks/venice/venice.c +++ b/board/gateworks/venice/venice.c @@ -128,8 +128,6 @@ int board_late_init(void) u8 enetaddr[6]; char fdt[64]; - led_default_state(); - /* Set board serial/model */ if (!env_get("serial#")) env_set_ulong("serial#", eeprom_get_serial()); diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c index 110496d995..e6877e4c07 100644 --- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c @@ -137,9 +137,6 @@ int board_late_init(void) add_board_boot_modes(board_boot_modes); #endif - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - env_set("boardname", "kp-tpc"); env_set("boardsoc", "imx6q"); return 0; diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c index 1c516aacd8..6abf08bd24 100644 --- a/board/mscc/jr2/jr2.c +++ b/board/mscc/jr2/jr2.c @@ -30,10 +30,6 @@ int board_early_init_r(void) /* Address of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE; - /* LED setup */ - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - return 0; } diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c index 038902d08a..76e3f2ebbc 100644 --- a/board/mscc/luton/luton.c +++ b/board/mscc/luton/luton.c @@ -31,10 +31,6 @@ int board_early_init_r(void) /* Address of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE; - /* LED setup */ - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - return 0; } diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c index c462890bb8..2a75ec281c 100644 --- a/board/mscc/ocelot/ocelot.c +++ b/board/mscc/ocelot/ocelot.c @@ -79,10 +79,6 @@ int board_early_init_r(void) /* Address of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE; - /* LED setup */ - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - return 0; } diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c index 94c1c42b79..87e7907657 100644 --- a/board/mscc/serval/serval.c +++ b/board/mscc/serval/serval.c @@ -24,10 +24,6 @@ int board_early_init_r(void) /* Address of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE; - /* LED setup */ - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - return 0; } diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c index 252d8e3156..bd8c7e8b70 100644 --- a/board/mscc/servalt/servalt.c +++ b/board/mscc/servalt/servalt.c @@ -24,10 +24,6 @@ int board_early_init_r(void) /* Address of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE; - /* LED setup */ - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - return 0; } diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c index f9cf4abd47..0f7235979b 100644 --- a/board/phytec/pcm052/pcm052.c +++ b/board/phytec/pcm052/pcm052.c @@ -360,9 +360,6 @@ int board_late_init(void) struct src *psrc = (struct src *)SRC_BASE_ADDR; u32 reg; - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - /* * BK4r1 handle emergency/service SD card boot * Checking the SBMR1 register BOOTCFG1 byte: diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 28ad6efd13..e054f300c4 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -107,9 +107,6 @@ int dram_init(void) int board_init(void) { - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - return 0; } diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c index dcbab8e4d2..4a02d64aec 100644 --- a/board/siemens/capricorn/board.c +++ b/board/siemens/capricorn/board.c @@ -244,10 +244,6 @@ static int board_led_init(void) u8 pca_led[2] = { 0x00, 0x00 }; int ret; - /* init all GPIO LED's */ - if (IS_ENABLED(CONFIG_LED)) - led_default_state(); - /* enable all leds on PCA9552 */ ret = uclass_get_device_by_seq(UCLASS_I2C, PCA9552_1_I2C_BUS, &bus); if (ret) { diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index fff1880e5b..7466e1c732 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -666,9 +666,6 @@ int board_init(void) if (IS_ENABLED(CONFIG_ARMV7_NONSEC)) sysconf_init(); - if (CONFIG_IS_ENABLED(LED)) - led_default_state(); - setup_led(LEDST_ON); return 0; diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 2ce72933b6..68ca3c2970 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -66,12 +66,6 @@ int led_set_period(struct udevice *dev, int period_ms) } #endif -/* This is superseded by led_post_bind()/led_post_probe() below. */ -int led_default_state(void) -{ - return 0; -} - static int led_post_bind(struct udevice *dev) { struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); diff --git a/include/led.h b/include/led.h index 43acca8571..329041008c 100644 --- a/include/led.h +++ b/include/led.h @@ -110,13 +110,4 @@ enum led_state_t led_get_state(struct udevice *dev); */ int led_set_period(struct udevice *dev, int period_ms); -/** - * led_default_state() - set the default state for all the LED - * - * This enables all leds which have default state. - * see Documentation/devicetree/bindings/leds/common.txt - * - */ -int led_default_state(void); - #endif diff --git a/test/dm/led.c b/test/dm/led.c index ac6ee36394..5bbe04648a 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -33,9 +33,6 @@ static int dm_test_led_default_state(struct unit_test_state *uts) { struct udevice *dev; - /* configure the default state (auto-probe) */ - led_default_state(); - /* Check that we handle the default-state property correctly. */ ut_assertok(led_get_by_label("sandbox:default_on", &dev)); ut_asserteq(LEDST_ON, led_get_state(dev));